[jboss-cvs] JBossAS SVN: r77329 - 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 17:30:16 -0400 (Thu, 21 Aug 2008)
New Revision: 77329

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ActiveSessionsLoadMetric.java
Log:
Make mbean attribute configurable since it will be different depending on the session Manager implementation.  Default to "LocalActiveSessions".

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ActiveSessionsLoadMetric.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ActiveSessionsLoadMetric.java	2008-08-21 20:38:55 UTC (rev 77328)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ActiveSessionsLoadMetric.java	2008-08-21 21:30:16 UTC (rev 77329)
@@ -34,7 +34,7 @@
  */
 public class ActiveSessionsLoadMetric extends AbstractLoadMetric
 {
-   private static final String ACTIVE_SESSIONS = "activeSessions";
+   private volatile String attribute = "LocalActiveSessions";
    
    private final SessionLoadMetricSource source;
    
@@ -45,19 +45,29 @@
       source.add(this);
    }
    
+   public String getActiveSessionsAttribute()
+   {
+      return this.attribute;
+   }
+   
+   public void setActiveSessionsAttribute(String attribute)
+   {
+      this.attribute = attribute;
+   }
+   
    /**
     * @{inheritDoc}
     * @see org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetric#getLoad()
     */
    public double getLoad() throws JMException
    {
-      int count = 0;
+      long count = 0;
       
-      List<Integer> results = this.source.getAttributes(ACTIVE_SESSIONS, Integer.class);
+      List<Number> results = this.source.getAttributes(this.attribute, Number.class);
       
-      for (Integer result: results)
+      for (Number result: results)
       {
-         count += result.intValue();
+         count += result.longValue();
       }
       
       return count;