synchronize on activeContext lock on close

crate · Apr 3, 2015 · 26eea66 · 26eea66
1 parent b6bbf63
commit 26eea66
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/sql/src/main/java/io/crate/operation/collect/JobCollectContext.java b/sql/src/main/java/io/crate/operation/collect/JobCollectContext.java
@@ -197,11 +197,13 @@ public void releaseContext(SearchContext context) {
     @Override
     public void close() {
         if (closed.compareAndSet(false, true)) { // prevent double release
-            Iterator<Integer> it = activeCollectors.keySet().iterator();
-            while (it.hasNext()) {
-                Integer jobSearchContextId = it.next();
-                closeContext(jobSearchContextId, false);
-                it.remove();
+            synchronized (lock) {
+                Iterator<Integer> it = activeCollectors.keySet().iterator();
+                while (it.hasNext()) {
+                    Integer jobSearchContextId = it.next();
+                    closeContext(jobSearchContextId, false);
+                    it.remove();
+                }
             }
         }
     }