Merge branch '3.7' of https://github.com/JumpMind/symmetric-ds into 3.8

JumpMind · Nov 23, 2015 · 6daa2a5 · 6daa2a5
2 parents cd1ee4a + 3e29377
commit 6daa2a5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java b/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java
@@ -22,13 +22,15 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -76,7 +78,7 @@ public NodeCommunicationService(IClusterService clusterService, INodeService nod
         this.currentlyExecuting = new HashMap<NodeCommunication.CommunicationType, Set<String>>();
         CommunicationType[] types = CommunicationType.values();
         for (CommunicationType communicationType : types) {
-            this.currentlyExecuting.put(communicationType, new HashSet<String>());
+            this.currentlyExecuting.put(communicationType, Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>()));
         }
     }