Repository: camel Updated Branches: refs/heads/camel-2.13.x ee02b82d6 -> 64aa22d6f refs/heads/camel-2.14.x 547cee013 -> fa690a5de refs/heads/master 4976ca964 -> 882857fa9
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/882857fa Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/882857fa Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/882857fa Branch: refs/heads/master Commit: 882857fa9cc058c880db3e55061e2409cf8370b3 Parents: 4976ca9 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:03 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/882857fa/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();
