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

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

Author: tcunning
Date: 2007-08-07 14:52:16 -0400 (Tue, 07 Aug 2007)
New Revision: 14085

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounter.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterMBean.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java
Log:
bug:JBESB-738
Don't return Double/Integer/Float as String - return them as the
correct class type so that we can parse numbers correctly.


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounter.java	2007-08-07 18:44:21 UTC (rev 14084)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounter.java	2007-08-07 18:52:16 UTC (rev 14085)
@@ -125,12 +125,12 @@
 	 * Get the average time to process a message.
 	 * @return average time to process a message 
 	 */
-	public String getAverageSuccessTime() {
+	public Double getAverageSuccessTime() {
 		if ((successMessageCount) > 0) {
 			double ms = (double) totalProcessTime / (1000000 * successMessageCount);
-			return ms + " ms";
+			return new Double(ms);
 		} else {
-			return "No successful messages processed.";
+			return null;
 		}
 	}
 

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterMBean.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterMBean.java	2007-08-07 18:44:21 UTC (rev 14084)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterMBean.java	2007-08-07 18:52:16 UTC (rev 14085)
@@ -40,7 +40,7 @@
 
 	public String getLastFailedMessageTime();
 	
-	public String getAverageSuccessTime();
+	public Double getAverageSuccessTime();
 	
 	public long getAverageSuccessBytes();
 	

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-07 18:44:21 UTC (rev 14084)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java	2007-08-07 18:52:16 UTC (rev 14085)
@@ -67,7 +67,7 @@
 	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";
+	private static final String PROCESSING_TIME = "processing time (ns)";
 
 	/**
 	 * Constructor
@@ -140,25 +140,30 @@
     public MBeanInfo getMBeanInfo() {
 		SortedSet<String> names = new TreeSet<String>();
 		
+		int count = actionCounterHash.size() + actionProcessTimeHash.size()
+			+ actionFailedCounterHash.size();
+        MBeanAttributeInfo[] attrs = new MBeanAttributeInfo[count];
+        int counter = 0;
+        
+		
 		for (String key : actionCounterHash.keySet()) {
-			names.add(key);
+            attrs[counter] = new MBeanAttributeInfo(
+                    key, "java.lang.Integer", "Property " + key, true, false, false);
+            counter++;
 		}
 		
 		for (String key : actionProcessTimeHash.keySet()) {
-			names.add(key);
+            attrs[counter] = new MBeanAttributeInfo(
+                    key, "java.lang.Integer", "Property " + key, true, false, false);
+            counter++;
 		}
 		
 		for (String key : actionFailedCounterHash.keySet()) {
-			names.add(key);
+            attrs[counter] = new MBeanAttributeInfo(
+                    key, "java.lang.Long", "Property " + key, true, false, false);
+            counter++;
 		}
-		
-        MBeanAttributeInfo[] attrs = new MBeanAttributeInfo[names.size()];
-        Iterator<String> it = names.iterator();
-        for (int i = 0; i < attrs.length; i++) {
-            String name = it.next();
-            attrs[i] = new MBeanAttributeInfo(
-                    name, "java.lang.String", "Property " + name, true, false, false);
-        }
+				
         MBeanOperationInfo[] opers = {
         	new MBeanOperationInfo(
         			RESET_COUNTER, "Reset the counter",
@@ -182,8 +187,9 @@
     		String actionId = key.substring(0, key.indexOf(PROCESSING_TIME)-1);
     		Integer successCount = actionCounterHash.get(actionId + " " + MESSAGE_COUNTER);
     		value = "-----";
+    		
     		if (successCount.intValue() > 0) {
-    			value = ((double) processTotal / successCount.intValue()) + " ns";
+    			value = ((double) processTotal / successCount.intValue()) + "";
     		}
     	} else if (actionFailedCounterHash.containsKey(key)) {
     		value = actionFailedCounterHash.get(key).toString();
@@ -209,7 +215,7 @@
 			Long processTotal = actionProcessTimeHash.get(key);
 			String actionId = key.substring(0, key.indexOf(PROCESSING_TIME));
 			Integer successCount = actionCounterHash.get(actionId + " " + MESSAGE_COUNTER);
-			String avgTime = "-----";
+			String avgTime = null;
 			if (successCount.intValue() > 0) {
 				avgTime = ((double) processTotal / successCount.intValue()) + " ns";
 			}