You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/12/17 15:18:29 UTC
svn commit: r1215494 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/impl/RouteService.java
camel-core/src/test/java/org/apache/camel/impl/RouteRemoveTest.java
Author: ningjiang
Date: Sat Dec 17 14:18:28 2011
New Revision: 1215494
URL: http://svn.apache.org/viewvc?rev=1215494&view=rev
Log:
Merged revisions 1215482 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1215482 | ningjiang | 2011-12-17 21:03:39 +0800 (Sat, 17 Dec 2011) | 1 line
CAMEL-4790 Using the CamelContext.stopRoute(routeId) should not remove the route from context
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/impl/RouteRemoveTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 17 14:18:28 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639,1214743,1215240,1215448
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639,1214743,1215240,1215448,1215482
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/impl/RouteService.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java?rev=1215494&r1=1215493&r2=1215494&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java Sat Dec 17 14:18:28 2011
@@ -199,8 +199,9 @@ public class RouteService extends Servic
// fire event
EventHelper.notifyRouteStopped(camelContext, route);
}
-
- camelContext.removeRouteCollection(routes);
+ if (isRemovingRoutes()) {
+ camelContext.removeRouteCollection(routes);
+ }
// need to warm up again
warmUpDone.set(false);
}
@@ -217,7 +218,9 @@ public class RouteService extends Servic
for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) {
strategy.onRoutesRemove(routes);
}
-
+
+ camelContext.removeRouteCollection(routes);
+
// clear inputs on shutdown
inputs.clear();
warmUpDone.set(false);
Modified: camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/impl/RouteRemoveTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/impl/RouteRemoveTest.java?rev=1215494&r1=1215493&r2=1215494&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/impl/RouteRemoveTest.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/impl/RouteRemoveTest.java Sat Dec 17 14:18:28 2011
@@ -17,6 +17,7 @@
package org.apache.camel.impl;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -25,6 +26,17 @@ import org.apache.camel.component.mock.M
*/
public class RouteRemoveTest extends ContextTestSupport {
+ public void testStopRouteOnContext() throws Exception {
+ assertEquals(ServiceStatus.Started, ((DefaultRoute) context.getRoute("foo")).getStatus());
+ assertEquals(ServiceStatus.Started, context.getRouteStatus("foo"));
+
+ context.stopRoute("foo");
+
+ assertEquals(ServiceStatus.Stopped, ((DefaultRoute) context.getRoute("foo")).getStatus());
+ assertEquals(ServiceStatus.Stopped, context.getRouteStatus("foo"));
+ }
+
+
public void testRemove() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("A");