[jboss-cvs] JBossAS SVN: r77173 - 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-18 17:23:27 -0400 (Mon, 18 Aug 2008)
New Revision: 77173

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/SessionLoadMetricSource.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java
Log:
ObjectName patterns must be dumbed down for Java 1.5.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java	2008-08-18 21:03:38 UTC (rev 77172)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java	2008-08-18 21:23:27 UTC (rev 77173)
@@ -61,6 +61,8 @@
    @Override
    protected String defaultObjectNamePattern()
    {
-      return "Catalina:type=GlobalRequestProcessor,name=*";
+      // return "Catalina:type=GlobalRequestProcessor,name=*";
+      // Java 1.5 only allows primitive ObjectName patterns
+      return "Catalina:type=GlobalRequestProcessor,*";
    }
 }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/SessionLoadMetricSource.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/SessionLoadMetricSource.java	2008-08-18 21:03:38 UTC (rev 77172)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/SessionLoadMetricSource.java	2008-08-18 21:23:27 UTC (rev 77173)
@@ -61,6 +61,8 @@
    @Override
    protected String defaultObjectNamePattern()
    {
-      return "Catalina:type=Manager,path=*,host=*";
+      // return "Catalina:type=Manager,path=/*,host=*";
+      // Java 1.5 only allows primitive ObjectName patterns
+      return "Catalina:type=Manager,*";
    }
 }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java	2008-08-18 21:03:38 UTC (rev 77172)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java	2008-08-18 21:23:27 UTC (rev 77173)
@@ -56,6 +56,8 @@
 
    protected String defaultObjectNamePattern()
    {
-      return "Catalina:type=ThreadPool,name=*";
+      // return "Catalina:type=ThreadPool,name=*";
+      // Java 1.5 only allows primitive ObjectName patterns
+      return "Catalina:type=ThreadPool,*";
    }
 }