Commit b005a89e authored by Jeremy Hylton's avatar Jeremy Hylton

Make thread join robust against runaways.

parent 85b81c60
...@@ -87,7 +87,8 @@ class ConnectionManager: ...@@ -87,7 +87,8 @@ class ConnectionManager:
if self._thread is not None: if self._thread is not None:
# XXX race on _thread # XXX race on _thread
self._thread.stop() self._thread.stop()
self._thread.join() self._thread.join(30)
assert not self._thread.isAlive()
finally: finally:
self._connect_lock.release() self._connect_lock.release()
if self.connection: if self.connection:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment