From c206a9ed35ac489ffc86b47fb6c8df69266a73fa Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Wed, 14 Feb 2007 15:40:47 +0000 Subject: Applied QPID-6 SSL Options patch from Kevin Smith git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@507584 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/cluster/Main.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'java/cluster/src/main') diff --git a/java/cluster/src/main/java/org/apache/qpid/server/cluster/Main.java b/java/cluster/src/main/java/org/apache/qpid/server/cluster/Main.java index 5746a32c26..15752353d1 100644 --- a/java/cluster/src/main/java/org/apache/qpid/server/cluster/Main.java +++ b/java/cluster/src/main/java/org/apache/qpid/server/cluster/Main.java @@ -44,9 +44,8 @@ import java.net.InetAddress; import java.net.InetSocketAddress; /** - * TODO: This is a cut-and-paste from the original broker Main class. Would be preferrable - * to make that class more reuseable to avoid all this duplication. - * + * TODO: This is a cut-and-paste from the original broker Main class. Would be preferrable to make that class more + * reuseable to avoid all this duplication. */ public class Main extends org.apache.qpid.server.Main { @@ -88,18 +87,16 @@ public class Main extends org.apache.qpid.server.Main String host = InetAddress.getLocalHost().getHostName(); ClusteredProtocolHandler handler = new ClusteredProtocolHandler(new InetSocketAddress(host, port)); - if (connectorConfig.enableNonSSL) + if (!connectorConfig.enableSSL) { acceptor.bind(new InetSocketAddress(port), handler, sconfig); _logger.info("Qpid.AMQP listening on non-SSL port " + port); handler.connect(commandLine.getOptionValue("j")); } - - if (connectorConfig.enableSSL) + else { ClusteredProtocolHandler sslHandler = new ClusteredProtocolHandler(handler); - sslHandler.setUseSSL(true); - acceptor.bind(new InetSocketAddress(connectorConfig.sslPort), handler, sconfig); + acceptor.bind(new InetSocketAddress(connectorConfig.sslPort), sslHandler, sconfig); _logger.info("Qpid.AMQP listening on SSL port " + connectorConfig.sslPort); } } -- cgit v1.2.1