[jboss-svn-commits] JBL Code SVN: r23191 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb.

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

Author: tcunning
Date: 2008-09-29 13:47:05 -0400 (Mon, 29 Sep 2008)
New Revision: 23191

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
Log:
JBESB-2043
Fix syntax errors caused by merge.


Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2008-09-29 16:35:28 UTC (rev 23190)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2008-09-29 17:47:05 UTC (rev 23191)
@@ -61,14 +61,10 @@
     public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) {
     	Configuration pluginConfig = this.context.getPluginConfiguration();
     	pluginConfig.put(new PropertySimple("type", "service"));
-<<<<<<< .mine
     	Integer overallMessages = new Integer(0);
     	
     	int bytesProcessed = 0;
     	int bytesFailed = 0;
-=======
-    	Integer overallMessages = null;
->>>>>>> .r23154
         for (MeasurementScheduleRequest request : requests) {
         	String metricName = request.getName();
         	if (metricName.equals(OVERALL_MESSAGE_METRIC)) {
@@ -93,7 +89,7 @@
         		report.addData(new MeasurementDataNumeric(request, new Double(processed.doubleValue())));        		
         	}
         }
-<<<<<<< .mine
+
         for (MeasurementScheduleRequest request : requests) {
         	String metricName = request.getName();
         	if (metricName.equals(OVERALL_MINUTE_METRIC_NAME)) {
@@ -102,13 +98,5 @@
         		report.addData(new MeasurementDataNumeric(request, new Double(bytesProcessed + bytesFailed)));
         	}
         }
-=======
-        for (MeasurementScheduleRequest request : requests) {
-        	String metricName = request.getName();
-        	if (metricName.equals(OVERALL_MINUTE_METRIC_NAME)) {
-        		report.addData(new MeasurementDataNumeric(request, new Double(overallMessages.doubleValue())));
-        	}
-        }
->>>>>>> .r23154
     }
 }