Make sure final-port in langohr.core/open is defined

michaelklishin · Nov 23, 2023 · a0b4bf7 · a0b4bf7
1 parent dee99aa
commit a0b4bf7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/clojure/langohr/core.clj b/src/clojure/langohr/core.clj
@@ -329,9 +329,14 @@
         cf   (ConnectionFactory.)
         final-properties (cond-> client-properties
                            connection-name (assoc "connection_name" connection-name)
-                           update-client-properties update-client-properties)]
-    (when (or ssl
-              (= port ConnectionFactory/DEFAULT_AMQP_OVER_SSL_PORT))
+                           update-client-properties update-client-properties)
+        tls-expected (or ssl
+                        (not (nil? ssl-context))
+                        (= port ConnectionFactory/DEFAULT_AMQP_OVER_SSL_PORT))
+        final-port  (or port (if tls-expected
+                               ConnectionFactory/DEFAULT_AMQP_OVER_SSL_PORT
+                               ConnectionFactory/DEFAULT_AMQP_PORT))]
+    (when tls-expected
       (.useSslProtocol cf))
     (doto cf
       (.setClientProperties   final-properties)