Merge pull request #1553 from ropalka/UNDERTOW-2345

ropalka · web-flow · commit 93d1549e5d6e · 2024-02-16T17:31:54.000+01:00
[UNDERTOW-2345] Use SSLContext from ClientEndpointConfig when provided
diff --git a/websockets-jsr/src/main/java/io/undertow/websockets/jsr/DefaultWebSocketClientSslProvider.java b/websockets-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);

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ public XnioSsl getSsl(XnioWorker worker, Endpoint endpoint, ClientEndpointConfig`
`63`	`63`	`}`
`64`	`64`	`//look for some SSL config`
`65`	`65`	`SSLContext sslContext = (SSLContext) cec.getUserProperties().get(SSL_CONTEXT);`
	`66`	`+ if (sslContext == null) {`
	`67`	`+ sslContext = cec.getSSLContext();`
	`68`	`+ }`
`66`	`69`
`67`	`70`	`if (sslContext != null) {`
`68`	`71`	`return new UndertowXnioSsl(worker.getXnio(), OptionMap.EMPTY, sslContext);`