commit d9de5a49a526a7d5509bbeb2c2ef0a9b1fa05172
author Nathan Marz <nathan@twitter.com> Sun Jan 15 18:28:06 2012 -0800
committer Nathan Marz <nathan@twitter.com> Sun Jan 15 18:28:06 2012 -0800
tree 774f624f243b1f8c31b553676a10ffbdbba4870f
parent 7d2de6b71f207af76f2e45db5be510b2460048cf
parent baae324079cf5a62f1c72e29c2196c336b53f070

Merge branch 'master' into 0.6.2

src/clj/backtype/storm/timer.clj

diff --git a/src/clj/backtype/storm/timer.clj b/src/clj/backtype/storm/timer.clj
index 3d06a88..d250632 100644
--- a/src/clj/backtype/storm/timer.clj
+++ b/src/clj/backtype/storm/timer.clj
@@ -25,7 +25,7 @@
                       (fn []
                         (while @active
                           (try
-                            (let [[time-secs _ _ :as elem] (.peek queue)]
+                            (let [[time-secs _ _ :as elem] (locking lock (.peek queue))]
                               (if (and elem (>= (current-time-secs) time-secs))
                                 ;; imperative to not run the function inside the timer lock
                                 ;; otherwise, it's possible to deadlock if function deals with other locks