[jboss-svn-commits] JBL Code SVN: r14279 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message.

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

Author: tcunning
Date: 2007-08-15 21:42:11 -0400 (Wed, 15 Aug 2007)
New Revision: 14279

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java
Log:
bug:JBESB-738
Change attribute names to end in "count" and "time" so that we can identify
them as count and time metrics.


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java	2007-08-16 01:39:44 UTC (rev 14278)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java	2007-08-16 01:42:11 UTC (rev 14279)
@@ -62,9 +62,9 @@
 	private ConfigTree[] actionArray;
 	
 	public static final String RESET_COUNTER = "resetCounter";
-	private static final String MESSAGE_COUNTER = "messages successfully processed";
-	private static final String FAILED_MESSAGE_COUNTER = "messages failed";
-	private static final String PROCESSING_TIME = "processing time (ns)";
+	private static final String MESSAGE_COUNTER = "messages successfully processed count";
+	private static final String FAILED_MESSAGE_COUNTER = "messages failed count";
+	private static final String PROCESSING_TIME = "processing time";
 
 	/**
 	 * Constructor
@@ -150,13 +150,13 @@
 		
 		for (String key : actionProcessTimeHash.keySet()) {
             attrs[counter] = new MBeanAttributeInfo(
-                    key, "java.lang.Integer", "Property " + key, true, false, false);
+                    key, "java.lang.Double", "Property " + key, true, false, false);
             counter++;
 		}
 		
 		for (String key : actionFailedCounterHash.keySet()) {
             attrs[counter] = new MBeanAttributeInfo(
-                    key, "java.lang.Long", "Property " + key, true, false, false);
+                    key, "java.lang.Integer", "Property " + key, true, false, false);
             counter++;
 		}
 				
@@ -174,29 +174,29 @@
 	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
 	 */
 	public Object getAttribute(String key) throws AttributeNotFoundException, MBeanException, ReflectionException {
-    	String value = null;
-    	
     	if (actionCounterHash.containsKey(key)) {
-    		value = actionCounterHash.get(key).toString();
+    		Integer value = null;
+    		value = actionCounterHash.get(key);
+    		return value;
     	} else if (actionProcessTimeHash.containsKey(key)) {
     		Long processTotal = actionProcessTimeHash.get(key);
     		String actionId = key.substring(0, key.indexOf(PROCESSING_TIME)-1);
     		Integer successCount = actionCounterHash.get(actionId + " " + MESSAGE_COUNTER);
-    		value = "-----";
+    		Double value = null;
     		
     		if (successCount.intValue() > 0) {
-    			value = ((double) processTotal / successCount.intValue()) + "";
+    			value = ((double) processTotal / successCount.intValue());
+    		} else {
+    			value = null;
     		}
+    		return value;
     	} else if (actionFailedCounterHash.containsKey(key)) {
-    		value = actionFailedCounterHash.get(key).toString();
+    		Integer value = actionFailedCounterHash.get(key);
+    		return value;
     	}
+    	return null;
+    }
 
-    	if (value != null)
-            return value;
-        else
-            throw new AttributeNotFoundException("No such property: " + key);
-	}
-
 	/* (non-Javadoc)
 	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
 	 */