camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/6] git commit: CAMEL-6771: Fixed potential concurrency exception in splitter. Thanks to James Carman for patch.
Date Sun, 29 Sep 2013 10:33:53 GMT
Updated Branches:
  refs/heads/camel-2.11.x 2176e5885 -> 3e262b41f
  refs/heads/camel-2.12.x ed2c71a4c -> fa3e871b4
  refs/heads/master 41f5c83e6 -> 9f5b99802


CAMEL-6771: Fixed potential concurrency exception in splitter. Thanks to James Carman for
patch.


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

Branch: refs/heads/master
Commit: 3e58b69ba612b62fe9bc6f1cf5ac26fdba4e769c
Parents: 41f5c83
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Sep 29 12:17:25 2013 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Sep 29 12:17:25 2013 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/camel/processor/MulticastProcessor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3e58b69b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index a0e150f..550a23e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -1021,11 +1021,11 @@ public class MulticastProcessor extends ServiceSupport implements
AsyncProcessor
         Map<?, ?> property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class);
         Map<Object, AggregationStrategy> map = CastUtils.cast(property);
         if (map == null) {
-            map = new HashMap<Object, AggregationStrategy>();
+            map = new ConcurrentHashMap<Object, AggregationStrategy>();
         } else {
             // it is not safe to use the map directly as the exchange doesn't have the deep
copy of it's properties
             // we just create a new copy if we need to change the map
-            map = new HashMap<Object, AggregationStrategy>(map);
+            map = new ConcurrentHashMap<Object, AggregationStrategy>(map);
         }
         // store the strategy using this processor as the key
         // (so we can store multiple strategies on the same exchange)


Mime
View raw message