summaryrefslogtreecommitdiff
path: root/qpid/java/client/src/main
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2014-08-07 00:20:24 +0000
committerAlex Rudyy <orudyy@apache.org>2014-08-07 00:20:24 +0000
commit87456620af31532eb5af81c0207e7533ae67fb39 (patch)
tree866844d60f28c65c90ac382a0383a1be4609b5c3 /qpid/java/client/src/main
parentdc820f18f1d290835df8e620e649ad73e2a7fc7b (diff)
downloadqpid-python-87456620af31532eb5af81c0207e7533ae67fb39.tar.gz
QPID-5960: Turn on SSL host name verification by default
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616378 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src/main')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java6
1 files changed, 5 insertions, 1 deletions
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 a659e44363..bde20d0550 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
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.client;
+import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.transport.ConnectionSettings;
import org.apache.qpid.url.URLHelper;
@@ -470,7 +471,10 @@ public class AMQBrokerDetails implements BrokerDetails, Serializable
}
// ----------------------------
- conSettings.setVerifyHostname(getBooleanProperty(BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME));
+ boolean defaultSSLVerifyHostName = Boolean.parseBoolean(
+ System.getProperty(ClientProperties.CONNECTION_OPTION_SSL_VERIFY_HOST_NAME,
+ String.valueOf(ClientProperties.DEFAULT_CONNECTION_OPTION_SSL_VERIFY_HOST_NAME)));
+ conSettings.setVerifyHostname(getBooleanProperty(BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME, defaultSSLVerifyHostName ));
if (getProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY) != null)
{