Merge branch 'master' into 0.9.0

jasonjckn · Jan 7, 2013 · 19a6ffa · 19a6ffa
2 parents cc5d7d2 + 9c3244e
commit 19a6ffa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,7 @@
  * Bug fix: bin/storm script now displays a helpful error message when an invalid command is specified
  * Bug fix: fixed NPE when emitting during emit method of Aggregator
  * Bug fix: URLs with periods in them in Storm UI now route correctly
+ * Bug fix: Fix occasional cascading worker crashes due when a worker dies due to not removing connections from connection cache appropriately
 
 ## 0.8.1
 

diff --git a/src/clj/backtype/storm/daemon/worker.clj b/src/clj/backtype/storm/daemon/worker.clj
@@ -252,7 +252,7 @@
                 (.close (get @(:cached-node+port->socket worker) endpoint)))
               (apply swap!
                      (:cached-node+port->socket worker)
-                     #(HashMap. (dissoc (into {} %1) %&))
+                     #(HashMap. (apply dissoc (into {} %1) %&))
                      remove-connections)
 
               (let [missing-tasks (->> needed-tasks