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/12/21 14:49:31 UTC

svn commit: r1424915 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/impl/DefaultCamelContext.java test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java

Author: davsclaus
Date: Fri Dec 21 13:49:31 2012
New Revision: 1424915

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

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1424915&r1=1424914&r2=1424915&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Fri Dec 21 13:49:31 2012
@@ -697,7 +697,6 @@ public class DefaultCamelContext extends
     }
 
     public synchronized void removeRouteDefinitions(Collection<RouteDefinition> routeDefinitions) throws Exception {
-        this.routeDefinitions.removeAll(routeDefinitions);
         for (RouteDefinition routeDefinition : routeDefinitions) {
             removeRouteDefinition(routeDefinition);
         }
@@ -707,6 +706,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/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java?rev=1424915&r1=1424914&r2=1424915&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java Fri Dec 21 13:49:31 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 {