summaryrefslogtreecommitdiff
path: root/qpid/java/client/src
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2011-07-14 08:15:31 +0000
committerRobert Gemmell <robbie@apache.org>2011-07-14 08:15:31 +0000
commita482bcfd2a86f3ef9a1717a370d4e89834e9cfa7 (patch)
tree544e607134b6e578594de90e79428ddcc28a1633 /qpid/java/client/src
parent828637b7af6f61f5c85f08a73fb3d8fa96ca583c (diff)
downloadqpid-python-a482bcfd2a86f3ef9a1717a370d4e89834e9cfa7.tar.gz
QPID-3345: restore/add ability to use sys props to select the NetworkTransport used to make/accept connections
Applied patch by Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1146594 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
index 22d1936463..0cd1d49224 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
@@ -52,7 +52,7 @@ import org.apache.qpid.ssl.SSLContextFactory;
import org.apache.qpid.transport.ConnectionSettings;
import org.apache.qpid.transport.network.NetworkConnection;
import org.apache.qpid.transport.network.OutgoingNetworkTransport;
-import org.apache.qpid.transport.network.mina.MinaNetworkTransport;
+import org.apache.qpid.transport.network.Transport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -105,7 +105,7 @@ public class AMQConnectionDelegate_8_0 implements AMQConnectionDelegate
sslFactory = new SSLContextFactory(sslConfig.getKeystorePath(), sslConfig.getKeystorePassword(), sslConfig.getCertType());
}
- OutgoingNetworkTransport transport = new MinaNetworkTransport();
+ OutgoingNetworkTransport transport = Transport.getOutgoingTransportInstance(getProtocolVersion());
NetworkConnection network = transport.connect(settings, _conn._protocolHandler, sslFactory);
_conn._protocolHandler.setNetworkConnection(network);
_conn._protocolHandler.getProtocolSession().init();