CAMEL-7836: Fixed potential ConcurrentModificationException when calling 
getRoutes.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa690a5d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa690a5d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa690a5d

Branch: refs/heads/camel-2.14.x
Commit: fa690a5de06e27a3d0580167d635e4313a893fc0
Parents: 547cee0
Author: Claus Ibsen <[email protected]>
Authored: Sun Sep 21 11:23:03 2014 +0200
Committer: Claus Ibsen <[email protected]>
Committed: Sun Sep 21 11:23:30 2014 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fa690a5d/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 7dd681d..ee204ad 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -653,7 +653,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
         return routeStartupOrder;
     }
 
-    public List<Route> getRoutes() {
+    public synchronized List<Route> getRoutes() {
         // lets return a copy of the collection as objects are removed later 
when services are stopped
         if (routes.isEmpty()) {
             return Collections.emptyList();

Reply via email to