From 6431dd50333cce065260e19d4a47a335c775ea1f Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Thu, 23 Oct 2008 18:55:08 +0000 Subject: This is related to QPID-1319 Agree with Aidan that SSL should only be a broker level option. I have removed the code that copied the top level ssl value to the broker options. I will also correct the examples on the qpid wiki page git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@707443 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/client/AMQBrokerDetails.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'qpid/java/client/src/main') diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java index fefb78d681..63c46e8dfc 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java @@ -49,15 +49,7 @@ public class AMQBrokerDetails implements BrokerDetails public AMQBrokerDetails(String url,Map options) throws URLSyntaxException { - /* According to the wiki the AMQBroker options should default to connection level options. - unless overridden by broker specific options. - Currently there seems to be only one such option (SSL). - */ - if (options != null) - { - _options.put(ConnectionURL.OPTIONS_SSL,options.get(ConnectionURL.OPTIONS_SSL)); - } - + // URL should be of format tcp://host:port?option='value',option='value' try { @@ -268,14 +260,7 @@ public class AMQBrokerDetails implements BrokerDetails { if (_options.containsKey(ConnectionURL.OPTIONS_SSL)) { - try - { - return Boolean.parseBoolean(_options.get(ConnectionURL.OPTIONS_SSL)); - } - catch (NumberFormatException nfe) - { - //Do nothing as we will use the default below. - } + return Boolean.parseBoolean(_options.get(ConnectionURL.OPTIONS_SSL)); } return false; -- cgit v1.2.1