Merge pull request #1553 from ropalka/UNDERTOW-2345

[UNDERTOW-2345] Use SSLContext from ClientEndpointConfig when provided
undertow-io · Feb 16, 2024 · 93d1549 · 93d1549
2 parents 0ec0746 + 6fab77b
commit 93d1549
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...ckets-jsr/src/main/java/io/undertow/websockets/jsr/DefaultWebSocketClientSslProvider.java b/...ckets-jsr/src/main/java/io/undertow/websockets/jsr/DefaultWebSocketClientSslProvider.java
@@ -63,6 +63,9 @@ public XnioSsl getSsl(XnioWorker worker, Endpoint endpoint, ClientEndpointConfig
         }
         //look for some SSL config
         SSLContext sslContext = (SSLContext) cec.getUserProperties().get(SSL_CONTEXT);
+        if (sslContext == null) {
+            sslContext = cec.getSSLContext();
+        }
 
         if (sslContext != null) {
             return new UndertowXnioSsl(worker.getXnio(), OptionMap.EMPTY, sslContext);