From 1f1439660e359ebccef08e4b4ede92a6e1f04d4f Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 25 Nov 2012 15:40:51 +0000 Subject: QPID-4469: remove the unused sslContext parameter in OutgoingNetworkTransport#connect() and cleanup associated dead code git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1413363 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/client/AMQConnectionDelegate_8_0.java | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'qpid/java/client') 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 fb18702de6..91896d913d 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 @@ -100,32 +100,10 @@ public class AMQConnectionDelegate_8_0 implements AMQConnectionDelegate ConnectionSettings settings = brokerDetail.buildConnectionSettings(); settings.setProtocol(brokerDetail.getTransport()); - SSLContext sslContext = null; - if (settings.isUseSSL()) - { - try - { - sslContext = SSLContextFactory.buildClientContext( - settings.getTrustStorePath(), - settings.getTrustStorePassword(), - settings.getTrustStoreType(), - settings.getTrustManagerFactoryAlgorithm(), - settings.getKeyStorePath(), - settings.getKeyStorePassword(), - settings.getKeyStoreType(), - settings.getKeyManagerFactoryAlgorithm(), - settings.getCertAlias()); - } - catch (GeneralSecurityException e) - { - throw new AMQException("Unable to create SSLContext: " + e.getMessage(), e); - } - } - SecurityLayer securityLayer = SecurityLayerFactory.newInstance(settings); OutgoingNetworkTransport transport = Transport.getOutgoingTransportInstance(getProtocolVersion()); - NetworkConnection network = transport.connect(settings, securityLayer.receiver(_conn.getProtocolHandler()), sslContext); + NetworkConnection network = transport.connect(settings, securityLayer.receiver(_conn.getProtocolHandler())); _conn.getProtocolHandler().setNetworkConnection(network, securityLayer.sender(network.getSender())); StateWaiter waiter = _conn.getProtocolHandler().createWaiter(openOrClosedStates); -- cgit v1.2.1