Respect system properties by default

rschmitt · rschmitt · commit 82f9f4a281aa · 2026-01-23T15:16:00.000-08:00
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java b/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java
@@ -63,11 +63,9 @@ private SSLContexts() {
      */
     public static SSLContext createDefault() throws SSLInitializationException {
         try {
-            final SSLContext sslContext = SSLContext.getInstance(SSLContextBuilder.TLS);
-            sslContext.init(null, null, null);
-            return sslContext;
-        } catch (final NoSuchAlgorithmException | KeyManagementException ex) {
-            throw new SSLInitializationException(ex.getMessage(), ex);
+            return SSLContext.getDefault();
+        } catch (final NoSuchAlgorithmException ex) {
+            return createDefault();
         }
     }
 
@@ -81,12 +79,9 @@ public static SSLContext createDefault() throws SSLInitializationException {
      * @return default system SSL context
      * @throws SSLInitializationException if {@link #createDefault()} throws it
      */
+    @Deprecated
     public static SSLContext createSystemDefault() throws SSLInitializationException {
-        try {
-            return SSLContext.getDefault();
-        } catch (final NoSuchAlgorithmException ex) {
-            return createDefault();
-        }
+        return createDefault();
     }
 
     /**
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/ssl/SSLContextsTest.java b/httpcore5/src/test/java/org/apache/hc/core5/ssl/SSLContextsTest.java
@@ -50,7 +50,7 @@ void createDefault() {
         final SSLContext sslContext = SSLContexts.createDefault();
         assertAll(
                 () -> assertNotNull(sslContext),
-                () -> assertEquals(SSLContextBuilder.TLS, sslContext.getProtocol()),
+                () -> assertEquals("Default", sslContext.getProtocol()),
                 () -> assertNotNull(sslContext.getProvider())
         );
     }
@@ -85,4 +85,4 @@ void custom() throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableK
                 () -> assertEquals("SunJSSE", sslContext.getProvider().getName())
         );
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ void createDefault() {`
`50`	`50`	`final SSLContext sslContext = SSLContexts.createDefault();`
`51`	`51`	`assertAll(`
`52`	`52`	`() -> assertNotNull(sslContext),`
`53`		`- () -> assertEquals(SSLContextBuilder.TLS, sslContext.getProtocol()),`
	`53`	`+ () -> assertEquals("Default", sslContext.getProtocol()),`
`54`	`54`	`() -> assertNotNull(sslContext.getProvider())`
`55`	`55`	`);`
`56`	`56`	`}`
`@@ -85,4 +85,4 @@ void custom() throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableK`
`85`	`85`	`() -> assertEquals("SunJSSE", sslContext.getProvider().getName())`
`86`	`86`	`);`
`87`	`87`	`}`
`88`		`-}`
	`88`	`+}`