You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/02/22 17:49:14 UTC
svn commit: r1292393 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/management/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/test/java/org/apache/camel/management/
Author: davsclaus
Date: Wed Feb 22 16:49:13 2012
New Revision: 1292393
URL: http://svn.apache.org/viewvc?rev=1292393&view=rev
Log:
CAMEL-5027: Fixed JMS stats for load balancer EIP
Added:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/management/ManagedLoadBalancerTest.java
- copied unchanged from r1292389, camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/management/ManagedLoadBalancerTest.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/management/ManagedMulticastTest.java
- copied unchanged from r1292389, camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/management/ManagedMulticastTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 16:49:13 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875,1244877,1291871,1292116
-/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870,1244872,1291848,1292114
+/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875,1244877,1291871,1292116,1292389
+/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870,1244872,1291848,1292114,1292384
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java?rev=1292393&r1=1292392&r2=1292393&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java Wed Feb 22 16:49:13 2012
@@ -67,4 +67,9 @@ public class DelegatePerformanceCounter
this.statisticsEnabled = statisticsEnabled;
}
}
+
+ @Override
+ public String toString() {
+ return counter != null ? counter.toString() : super.toString();
+ }
}
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java?rev=1292393&r1=1292392&r2=1292393&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java Wed Feb 22 16:49:13 2012
@@ -78,6 +78,11 @@ public class InstrumentationProcessor ex
callback.done(doneSync);
}
}
+
+ @Override
+ public String toString() {
+ return InstrumentationProcessor.this.toString();
+ }
});
}
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java?rev=1292393&r1=1292392&r2=1292393&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java Wed Feb 22 16:49:13 2012
@@ -137,7 +137,7 @@ public class LoadBalanceDefinition exten
throw new IllegalArgumentException("Loadbalancer already configured to: " + loadBalancerType + ". Cannot set it to: " + processorType);
}
Processor processor = processorType.createProcessor(routeContext);
- processor = wrapProcessor(routeContext, processor);
+ processor = wrapChannel(routeContext, processor, processorType);
loadBalancer.addProcessor(processor);
}
return loadBalancer;