Skip to content

Commit 325cf7a

Browse files
committed
Fixing wrong warning about trustmanager trusteverything even when ssl context is provided
1 parent 289d6f2 commit 325cf7a

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/clojure/langohr/core.clj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,6 @@
343343
final-port (or port (if tls-expected
344344
ConnectionFactory/DEFAULT_AMQP_OVER_SSL_PORT
345345
ConnectionFactory/DEFAULT_AMQP_PORT))]
346-
(when tls-expected
347-
(.useSslProtocol cf))
348346
(doto cf
349347
(.setClientProperties final-properties)
350348
(.setVirtualHost vhost)
@@ -406,9 +404,12 @@
406404
(.setTrafficListener cf traffic-listener))
407405
(when sasl-config
408406
(.setSaslConfig cf sasl-config))
409-
(when ssl-context
410-
(.useSslProtocol cf ^javax.net.ssl.SSLContext ssl-context)
411-
(.setPort cf final-port))
407+
(when tls-expected
408+
(if ssl-context
409+
(do
410+
(.useSslProtocol cf ^javax.net.ssl.SSLContext ssl-context)
411+
(.setPort cf final-port))
412+
(.useSslProtocol cf)))
412413
(when verify-hostname
413414
(.enableHostnameVerification cf))
414415
(when thread-factory

0 commit comments

Comments
 (0)