Merge pull request rabbitmq#298 from rabbitmq/rabbitmq-java-client-297

michaelklishin · web-flow · commit 54299d9bcce6 · 2017-09-05T08:43:02.000-07:00
Don't blindly overwrite SSLContext when specifying URI
diff --git a/src/main/java/com/rabbitmq/client/ConnectionFactory.java b/src/main/java/com/rabbitmq/client/ConnectionFactory.java
@@ -226,7 +226,10 @@ public void setUri(URI uri)
             // nothing special to do
         } else if ("amqps".equals(uri.getScheme().toLowerCase())) {
             setPort(DEFAULT_AMQP_OVER_SSL_PORT);
-            useSslProtocol();
+            // SSL context not set yet, we use the default one
+            if (this.sslContext == null) {
+                useSslProtocol();
+            }
         } else {
             throw new IllegalArgumentException("Wrong scheme in AMQP URI: " +
                                                uri.getScheme());
