camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/8] git commit: CAMEL-7666: Fixed potential java.util.ConcurrentModificationException using addService.
Date Thu, 07 Aug 2014 14:48:22 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x b668bcaa2 -> 920cfd75b
  refs/heads/camel-2.13.x 4b3dbc616 -> 66acc68eb
  refs/heads/master ee8f18073 -> 3d14a21d9


CAMEL-7666: Fixed potential java.util.ConcurrentModificationException using addService.


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

Branch: refs/heads/master
Commit: 67ba6ff0d7687cc8fe3c70191d4d209d6f42eaa5
Parents: ee8f180
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Aug 7 10:24:52 2014 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Aug 7 10:24:52 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/67ba6ff0/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 fa4d673..dab1eaa 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
@@ -32,6 +32,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -170,7 +171,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
     private LanguageResolver languageResolver = new DefaultLanguageResolver();
     private final Map<String, Language> languages = new HashMap<String, Language>();
     private Registry registry;
-    private List<LifecycleStrategy> lifecycleStrategies = new ArrayList<LifecycleStrategy>();
+    private List<LifecycleStrategy> lifecycleStrategies = new CopyOnWriteArrayList<LifecycleStrategy>();
     private ManagementStrategy managementStrategy;
     private ManagementMBeanAssembler managementMBeanAssembler;
     private final List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();


Mime
View raw message