summaryrefslogtreecommitdiff
path: root/qpid/python
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2013-05-01 17:45:05 +0000
committerAlan Conway <aconway@apache.org>2013-05-01 17:45:05 +0000
commitdc0f3f50753f096c59bf2e8fe01b6c98784bd0a4 (patch)
tree2c5a961705cc8524d553bea233aa4dce34a71eae /qpid/python
parentf48b0a4ea074676d78ed98072570d09607bd1f3f (diff)
downloadqpid-python-dc0f3f50753f096c59bf2e8fe01b6c98784bd0a4.tar.gz
NO-JIRA: Trivial python client fix, pass timeout in Sender.send.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1478115 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
-rw-r--r--qpid/python/qpid/messaging/endpoints.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py
index 8576099c0f..b4ddcc3f77 100644
--- a/qpid/python/qpid/messaging/endpoints.py
+++ b/qpid/python/qpid/messaging/endpoints.py
@@ -856,7 +856,7 @@ class Sender(Endpoint):
if not self.session.connection._connected or self.session.closing:
raise Detached()
- self._ecwait(lambda: self.linked)
+ self._ecwait(lambda: self.linked, timeout=timeout)
if isinstance(object, Message):
message = object