[jboss-cvs] JBossAS SVN: r85296 - projects/jbossmx/trunk/jmx/src/main/org/jboss/mx/server/registry.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 5 09:47:26 EST 2009
Author: adrian at jboss.org
Date: 2009-03-05 09:47:26 -0500 (Thu, 05 Mar 2009)
New Revision: 85296
Modified:
projects/jbossmx/trunk/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
Log:
[JBMX-10] - Port JBAS-6571
Modified: projects/jbossmx/trunk/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
===================================================================
--- projects/jbossmx/trunk/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2009-03-05 14:41:34 UTC (rev 85295)
+++ projects/jbossmx/trunk/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2009-03-05 14:47:26 UTC (rev 85296)
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
import java.util.Vector;
+
import javax.management.Descriptor;
import javax.management.DynamicMBean;
import javax.management.InstanceAlreadyExistsException;
@@ -49,13 +50,9 @@
import javax.management.modelmbean.ModelMBeanInfo;
import javax.management.modelmbean.RequiredModelMBean;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-
import org.jboss.classloading.spi.RealClassLoader;
import org.jboss.logging.Logger;
import org.jboss.mx.loading.LoaderRepository;
-import org.jboss.mx.loading.RepositoryClassLoader;
import org.jboss.mx.metadata.MBeanCapability;
import org.jboss.mx.modelmbean.ModelMBeanConstants;
import org.jboss.mx.modelmbean.RequiredModelMBeanInvoker;
@@ -66,10 +63,11 @@
import org.jboss.mx.server.RawDynamicInvoker;
import org.jboss.mx.server.ServerConfig;
import org.jboss.mx.server.ServerObjectInstance;
-import org.jboss.mx.util.ObjectNamePatternHelper;
-import org.jboss.mx.util.ObjectNamePatternHelper.PropertyPattern;
import org.jboss.util.NestedRuntimeException;
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
+
/**
* The registry for object name - object reference mapping in the
* MBean server.
@@ -626,11 +624,6 @@
// Now we have to do a brute force, oh well.
else
{
- String patternDomain = pattern.getDomain();
- if (patternDomain.length() == 0)
- patternDomain = defaultDomain;
- PropertyPattern propertyPattern = new PropertyPattern(pattern);
-
// Here we go, step through every domain and see if our pattern matches before optionally checking
// each ObjectName's properties for a match.
for (Iterator domainIter = domainMap.entrySet().iterator(); domainIter.hasNext();)
@@ -639,14 +632,11 @@
Map value = (Map) mapEntry.getValue();
if (value != null && value.isEmpty() == false)
{
- if (ObjectNamePatternHelper.patternMatch((String) mapEntry.getKey(), patternDomain))
+ for (Iterator mbeanIter = value.values().iterator(); mbeanIter.hasNext();)
{
- for (Iterator mbeanIter = value.values().iterator(); mbeanIter.hasNext();)
- {
- MBeanEntry entry = (MBeanEntry) mbeanIter.next();
- if (propertyPattern.patternMatch(entry.getObjectName()))
- retval.add(entry);
- }
+ MBeanEntry entry = (MBeanEntry) mbeanIter.next();
+ if (pattern.apply(entry.getObjectName()))
+ retval.add(entry);
}
}
}
More information about the jboss-cvs-commits
mailing list