Author: grkvlt
Date: Sun Oct 24 23:52:12 2010
New Revision: 1026917
URL: http://svn.apache.org/viewvc?rev=1026917&view=rev
Log:
QPID-2910: Small fix for python timeout tests
Patch submitted by Sorin S <ssu...@gmail.com>
Modified:
qpid/trunk/qpid/python/qpid/messaging/endpoints.py
Modified: qpid/trunk/qpid/python/qpid/messaging/endpoints.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging/endpoints.py?rev=1026917&r1=1026916&r2=1026917&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging/endpoints.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging/endpoints.py Sun Oct 24 23:52:12 2010
@@ -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:
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
