[Zodb-checkins] SVN: ZODB/trunk/src/ZEO/zrpc/client.py The rpc manager can be called from the client loop if there is an error in

Jim Fulton jim at zope.com
Fri Feb 5 16:52:00 EST 2010


Log message for revision 108801:
  
  The rpc manager can be called from the client loop if there is an error in
  the client loop.
  

Changed:
  U   ZODB/trunk/src/ZEO/zrpc/client.py

-=-
Modified: ZODB/trunk/src/ZEO/zrpc/client.py
===================================================================
--- ZODB/trunk/src/ZEO/zrpc/client.py	2010-02-05 21:51:23 UTC (rev 108800)
+++ ZODB/trunk/src/ZEO/zrpc/client.py	2010-02-05 21:52:00 UTC (rev 108801)
@@ -217,7 +217,10 @@
 
         self.map.clear()
         self.trigger.pull_trigger()
-        self.loop_thread.join(9)
+        try:
+            self.loop_thread.join(9)
+        except RuntimeError:
+            pass # we are the thread :)
         self.trigger.close()
 
     def attempt_connect(self):



More information about the Zodb-checkins mailing list