[jboss-cvs] JBossAS SVN: r99121 - in projects/kernel/trunk/kernel/src: main/java/org/jboss/kernel/spi/qualifier and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 7 11:36:35 EST 2010
Author: alesj
Date: 2010-01-07 11:36:34 -0500 (Thu, 07 Jan 2010)
New Revision: 99121
Added:
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/FilterImpl.java
Modified:
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifiersKey.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Filter.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/MockFilterMatcherAndParser.java
Log:
Fix matching, KCC bug.
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifiersKey.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifiersKey.java 2010-01-07 16:20:14 UTC (rev 99120)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifiersKey.java 2010-01-07 16:36:34 UTC (rev 99121)
@@ -169,7 +169,7 @@
if (contexts.size() == 0)
return null;
- KernelControllerContext found = null;
+ ControllerContext found = null;
if (contexts.size() > 0)
{
for (ControllerContext context : contexts)
@@ -183,7 +183,7 @@
}
return null;
}
- found = (KernelControllerContext)context;
+ found = context;
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java 2010-01-07 16:20:14 UTC (rev 99120)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java 2010-01-07 16:36:34 UTC (rev 99121)
@@ -21,6 +21,7 @@
*/
package org.jboss.kernel.spi.qualifier;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -91,7 +92,16 @@
@SuppressWarnings({"unchecked"})
public boolean matches(ControllerContext context, Set<Object> suppliedQualifiers, Object qualifier)
{
- QualifierMatcher matcher = matchers.get(qualifier.getClass());
+ Class<?> clazz = qualifier.getClass();
+ QualifierMatcher matcher = null;
+ for (Map.Entry<Class<?>, QualifierMatcher> entry : matchers.entrySet())
+ {
+ if (entry.getKey().isAssignableFrom(clazz))
+ {
+ matcher = entry.getValue();
+ break;
+ }
+ }
if (matcher == null)
matcher = DefaultEqualsMatcher.SINGLETON;
return matcher.matches(context, suppliedQualifiers, qualifier);
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Filter.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Filter.java 2010-01-07 16:20:14 UTC (rev 99120)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Filter.java 2010-01-07 16:36:34 UTC (rev 99121)
@@ -22,37 +22,11 @@
package org.jboss.test.kernel.qualifiers.support;
import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Map;
/**
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class Filter
+public interface Filter
{
- private Map<String, String> props = new HashMap<String, String>();
-
- public Filter(String string)
- {
- String[] ps = string.split(",");
- for(String p : ps)
- {
- String[] pps = p.split("=");
- props.put(pps[0], pps[1]);
- }
- }
-
- public boolean filter(Dictionary<String, Object> dictionary)
- {
- if (dictionary == null || dictionary.isEmpty())
- return false;
-
- for (Map.Entry<String, String> entry : props.entrySet())
- {
- Object value = dictionary.get(entry.getKey());
- if (entry.getValue().equals(value) == false)
- return false;
- }
- return true;
- }
+ boolean filter(Dictionary<String, Object> dictionary);
}
\ No newline at end of file
Copied: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/FilterImpl.java (from rev 99110, projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Filter.java)
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/FilterImpl.java (rev 0)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/FilterImpl.java 2010-01-07 16:36:34 UTC (rev 99121)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.kernel.qualifiers.support;
+
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class FilterImpl implements Filter
+{
+ private Map<String, String> props = new HashMap<String, String>();
+
+ public FilterImpl(String string)
+ {
+ String[] ps = string.split(",");
+ for(String p : ps)
+ {
+ String[] pps = p.split("=");
+ props.put(pps[0], pps[1]);
+ }
+ }
+
+ public boolean filter(Dictionary<String, Object> dictionary)
+ {
+ if (dictionary == null || dictionary.isEmpty())
+ return false;
+
+ for (Map.Entry<String, String> entry : props.entrySet())
+ {
+ Object value = dictionary.get(entry.getKey());
+ if (entry.getValue().equals(value) == false)
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/MockFilterMatcherAndParser.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/MockFilterMatcherAndParser.java 2010-01-07 16:20:14 UTC (rev 99120)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/MockFilterMatcherAndParser.java 2010-01-07 16:36:34 UTC (rev 99121)
@@ -66,11 +66,11 @@
public Object parseSupplied(ClassLoader cl, Object rawQualifier)
{
- return new Filter((String)rawQualifier);
+ return new FilterImpl((String)rawQualifier);
}
public Object parseWanted(ClassLoader cl, Object object)
{
- return new Filter((String)object);
+ return new FilterImpl((String)object);
}
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list