[Zodb-checkins] CVS: Zope/lib/python/ZEO/zrpc - trigger.py:1.8.14.2

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/ZEO/zrpc
In directory cvs.zope.org:/tmp/cvs-serv25283/ZEO/zrpc

Modified Files:
      Tag: ajung-restructuredtext-integration-branch
	trigger.py 
Log Message:
merge from trunk

=== Zope/lib/python/ZEO/zrpc/trigger.py 1.8.14.1 => 1.8.14.2 ===
--- Zope/lib/python/ZEO/zrpc/trigger.py:1.8.14.1	Sat Nov  9 03:42:59 2002
+++ Zope/lib/python/ZEO/zrpc/trigger.py	Sat Nov 16 11:40:45 2002
@@ -94,7 +94,10 @@
             os.write(self.trigger, 'x')
 
         def handle_read(self):
-            self.recv(8192)
+            try:
+                self.recv(8192)
+            except socket.error:
+                return
             self.lock.acquire()
             try:
                 for thunk in self.thunks:
@@ -182,7 +185,10 @@
             self.trigger.send('x')
 
         def handle_read(self):
-            self.recv(8192)
+            try:
+                self.recv(8192)
+            except socket.error:
+                return
             self.lock.acquire()
             try:
                 for thunk in self.thunks: