Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/activity.py
diff options
context:
space:
mode:
authorBenjamin Schwartz <bens@alum.mit.edu>2007-10-02 17:42:00 (GMT)
committer Benjamin Schwartz <bens@alum.mit.edu>2007-10-02 17:42:00 (GMT)
commit62fb8d0227bf8976b27afe8acbef155b7da37ce4 (patch)
tree9a1831065aadd8a2f2d98ff25233cfc2d92ba372 /activity.py
parent962a6cd2f8e32ad68acfbd833860053e84f03413 (diff)
Fixed Deadlock and File Error
Diffstat (limited to 'activity.py')
-rw-r--r--activity.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/activity.py b/activity.py
index c17f92c..d0776b0 100644
--- a/activity.py
+++ b/activity.py
@@ -418,7 +418,10 @@ class HelloTube(ExportedGObject):
self._remote_socket_waiter.wait(self._timeout)
q = base64.b64encode(string)
self._logger.debug("sendall: " + q)
- self._remote_socket._handle_incoming(q)
+ w = threading.Event()
+ self._remote_socket._handle_incoming(q, reply_handler=w.set, error_handler=self._logger.debug)
+ self._logger.debug("sendall: waiting for confirmation")
+ w.wait()
self._logger.debug("sendall; sent")
return len(string)
else: