Merge branch 'master' into 0.7.0
diff --git a/src/clj/backtype/storm/zookeeper.clj b/src/clj/backtype/storm/zookeeper.clj
index a90072d..83927b1 100644
--- a/src/clj/backtype/storm/zookeeper.clj
+++ b/src/clj/backtype/storm/zookeeper.clj
@@ -51,7 +51,10 @@
              (if (or (exception-cause? InterruptedException error)
                      (exception-cause? java.nio.channels.ClosedByInterruptException error))
                (do (log-warn-error error "Zookeeper exception " msg)
-                   (throw error))
+                   (let [to-throw (InterruptedException.)]
+                     (.initCause to-throw error)
+                     (throw to-throw)
+                     ))
                (do (log-error error "Unrecoverable Zookeeper error " msg)
                    (halt-process! 1 "Unrecoverable Zookeeper error")))
              ))))