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 2013/04/22 17:38:20 UTC
svn commit: r1470583 - in /camel/branches/camel-2.11.x: ./
camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
Author: davsclaus
Date: Mon Apr 22 15:38:20 2013
New Revision: 1470583
URL: http://svn.apache.org/r1470583
Log:
CAMEL-6301: Added reset method to context and routes mbean, to easily reset the children as well.
Modified:
camel/branches/camel-2.11.x/ (props changed)
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1470427
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 22 15:38:20 2013
@@ -1 +1 @@
-/camel/trunk:1-1468763,1469819,1470420,1470426,1470429,1470508
+/camel/trunk:1-1468763,1469819,1470420,1470426-1470427,1470429,1470508
Modified: camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java?rev=1470583&r1=1470582&r2=1470583&view=diff
==============================================================================
--- camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java (original)
+++ camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java Mon Apr 22 15:38:20 2013
@@ -339,7 +339,7 @@ public class ManagedCamelContext extends
public void reset(boolean includeRoutes) throws Exception {
reset();
- // and now reset all processors for this route
+ // and now reset all routes for this route
if (includeRoutes) {
MBeanServer server = getContext().getManagementStrategy().getManagementAgent().getMBeanServer();
if (server != null) {