[jboss-cvs] JBossAS SVN: r77327 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl.

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

Author: pferraro
Date: 2008-08-21 16:23:06 -0400 (Thu, 21 Aug 2008)
New Revision: 77327

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ObjectNamePatternLoadMetricSource.java
Log:
Skip mbean query if name is not a pattern.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ObjectNamePatternLoadMetricSource.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ObjectNamePatternLoadMetricSource.java	2008-08-21 19:35:53 UTC (rev 77326)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ObjectNamePatternLoadMetricSource.java	2008-08-21 20:23:06 UTC (rev 77327)
@@ -23,6 +23,7 @@
 
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -43,6 +44,7 @@
 public abstract class ObjectNamePatternLoadMetricSource extends AbstractLoadMetricSource
 {
    private final MBeanServer server;
+   
    private volatile String domain = "jboss.web";
    private volatile String propertyPattern = this.defaultPropertyPattern();
    
@@ -102,9 +104,9 @@
    {
       try
       {
-         ObjectName pattern = ObjectName.getInstance(this.domain + ":" + this.propertyPattern);
+         ObjectName name = ObjectName.getInstance(this.domain + ":" + this.propertyPattern);
          
-         this.objectNames = this.server.queryNames(pattern, null);         
+         this.objectNames = name.isPattern() ? this.server.queryNames(name, null) : Collections.singleton(name);
       }
       catch (MalformedObjectNameException e)
       {