Fix serious bug in heartbeat logic that can result in no-timeout polls.

ipython · May 8, 2011 · 9832ac6 · 9832ac6
1 parent 8f2075c
commit 9832ac6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/IPython/zmq/kernelmanager.py b/IPython/zmq/kernelmanager.py
@@ -573,7 +573,8 @@ def run(self):
                                 # list, poll is working correctly even if it
                                 # returns quickly. Note: poll timeout is in
                                 # milliseconds.
-                                self.poller.poll(1000*until_dead)
+                                if until_dead > 0.0:
+                                    self.poller.poll(1000 * until_dead)
 
                                 since_last_heartbeat = time.time()-request_time
                                 if since_last_heartbeat > self.time_to_dead: