Author: rhs
Date: Tue Jun 2 14:23:20 2009
New Revision: 781041
URL: http://svn.apache.org/viewvc?rev=781041&view=rev
Log:
made Future.get throw an exception on timeout
Modified:
qpid/trunk/qpid/python/qpid/datatypes.py
Modified: qpid/trunk/qpid/python/qpid/datatypes.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/datatypes.py?rev=781041&r1=781040&r2=781041&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/datatypes.py (original)
+++ qpid/trunk/qpid/python/qpid/datatypes.py Tue Jun 2 14:23:20 2009
@@ -18,6 +18,7 @@
#
import threading, struct, datetime, time
+from exceptions import Timeout
class Struct:
@@ -253,9 +254,12 @@
def get(self, timeout=None):
self._set.wait(timeout)
- if self._error != None:
- raise self.exception(self._error)
- return self.value
+ if self._set.isSet():
+ if self._error != None:
+ raise self.exception(self._error)
+ return self.value
+ else:
+ raise Timeout()
def is_set(self):
return self._set.isSet()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
