Author: davsclaus
Date: Fri Dec 21 13:51:22 2012
New Revision: 1424918

URL: http://svn.apache.org/viewvc?rev=1424918&view=rev
Log:
CAMEL-5888: Make sure to remove route definitions when removeing them using the 
API.

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1424915

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1424918&r1=1424917&r2=1424918&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 Fri Dec 21 13:51:22 2012
@@ -690,7 +690,6 @@ public class DefaultCamelContext extends
     }
 
     public synchronized void 
removeRouteDefinitions(Collection<RouteDefinition> routeDefinitions) throws 
Exception {
-        this.routeDefinitions.removeAll(routeDefinitions);
         for (RouteDefinition routeDefinition : routeDefinitions) {
             removeRouteDefinition(routeDefinition);
         }
@@ -700,6 +699,7 @@ public class DefaultCamelContext extends
         String id = routeDefinition.idOrCreate(nodeIdFactory);
         stopRoute(id);
         removeRoute(id);
+        this.routeDefinitions.remove(routeDefinition);
     }
 
     public ServiceStatus getRouteStatus(String key) {

Modified: 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java?rev=1424918&r1=1424917&r2=1424918&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java
 Fri Dec 21 13:51:22 2012
@@ -82,12 +82,15 @@ public class CamelContextAddRouteDefinit
         assertEquals(0, context.getRoutes().size());
 
         context.addRouteDefinition(route);
+        assertEquals(1, context.getRouteDefinitions().size());
         assertEquals(1, context.getRoutes().size());
         assertTrue("Route should be started", 
context.getRouteStatus("foo").isStarted());
 
         context.removeRouteDefinition(route);
         assertEquals(0, context.getRoutes().size());
         assertNull(context.getRouteStatus("foo"));
+
+        assertEquals(0, context.getRouteDefinitions().size());
     }
 
     public void testAddRouteDefinitionsFromXml2() throws Exception {


Reply via email to