[jboss-cvs] JBossAS SVN: r85294 - branches/Branch_5_x/jmx/src/main/org/jboss/mx/server/registry.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2009-03-05 09:18:19 -0500 (Thu, 05 Mar 2009)
New Revision: 85294

Modified:
   branches/Branch_5_x/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
Log:
[JBAS-6571] - Use ObjectName.apply() to ensure queryMBeans/Names is consistent with the JDK ObjectName pattern implementation

Modified: branches/Branch_5_x/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
===================================================================
--- branches/Branch_5_x/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java	2009-03-05 13:45:47 UTC (rev 85293)
+++ branches/Branch_5_x/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java	2009-03-05 14:18:19 UTC (rev 85294)
@@ -55,7 +55,6 @@
 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,8 +65,6 @@
 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;
 
 /**
@@ -626,11 +623,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 +631,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);
                }
             }
          }