diff options
| author | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-10-24 23:52:12 +0000 |
|---|---|---|
| committer | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-10-24 23:52:12 +0000 |
| commit | f2be8b1a00db0ddf675b34c5e855c7998612e78d (patch) | |
| tree | b762d5ddc3dda8cebad032d8c95c12208dc8422e /qpid/python | |
| parent | f86e9093784d583f9af5068cbb5cdbc9a0f90e19 (diff) | |
| download | qpid-python-f2be8b1a00db0ddf675b34c5e855c7998612e78d.tar.gz | |
QPID-2910: Small fix for python timeout tests
Patch submitted by Sorin S <ssuciu@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1026917 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
| -rw-r--r-- | qpid/python/qpid/messaging/endpoints.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py index 886b7f1706..b8101b76e6 100644 --- a/qpid/python/qpid/messaging/endpoints.py +++ b/qpid/python/qpid/messaging/endpoints.py @@ -124,12 +124,14 @@ class Connection(Endpoint): if isinstance(url, basestring): url = URL(url) self.host = url.host - if url.scheme == url.AMQP: + if options.has_key("transport"): + self.transport = options.get("transport") + elif url.scheme == url.AMQP: self.transport = "tcp" elif url.scheme == url.AMQPS: self.transport = "ssl" else: - self.transport = options.get("transport", "tcp") + self.transport = "tcp" if self.transport in ("ssl", "tcp+tls"): self.port = default(url.port, options.get("port", AMQPS_PORT)) else: |