Skip to content

Commit 68772bc

Browse files
committed
Merge branch '4.3.x-stable'
2 parents a55b97f + 1ec2daf commit 68772bc

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/main/java/com/rabbitmq/client/ConnectionFactory.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,10 @@ public void setUri(URI uri)
230230
// nothing special to do
231231
} else if ("amqps".equals(uri.getScheme().toLowerCase())) {
232232
setPort(DEFAULT_AMQP_OVER_SSL_PORT);
233-
useSslProtocol();
233+
// SSL context not set yet, we use the default one
234+
if (this.sslContext == null) {
235+
useSslProtocol();
236+
}
234237
} else {
235238
throw new IllegalArgumentException("Wrong scheme in AMQP URI: " +
236239
uri.getScheme());

0 commit comments

Comments
 (0)