From b328bc14a00dc1ce229eec9777e66c363f8acd8e Mon Sep 17 00:00:00 2001
From: Rahul Yadav <ryadav@openjdk.org>
Date: Tue, 18 Aug 2020 16:44:42 +0100
Subject: [PATCH] 8251715: Throw UncheckedIOException in place of InternalError
 when HttpClient fails due to unavailability of underlying resources required
 by SSLContext

This fix updates jdk.internal.net.http.HttpClientImpl to throw an UncheckedIOException instead of InternalError.

Reviewed-by: chegar, dfuchs
---
 .../jdk/internal/net/http/HttpClientImpl.java |  2 +-
 .../java/net/httpclient/SSLExceptionTest.java | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/net/httpclient/SSLExceptionTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
index 1f7ed72cb7a..65a60d0b4bb 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
@@ -267,7 +267,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
             try {
                 sslContext = SSLContext.getDefault();
             } catch (NoSuchAlgorithmException ex) {
-                throw new InternalError(ex);
+                throw new UncheckedIOException(new IOException(ex));
             }
         } else {
             sslContext = builder.sslContext;
diff --git a/test/jdk/java/net/httpclient/SSLExceptionTest.java b/test/jdk/java/net/httpclient/SSLExceptionTest.java
new file mode 100644
index 00000000000..ce73cd901f9
--- /dev/null
+++ b/test/jdk/java/net/httpclient/SSLExceptionTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.UncheckedIOException;
+import java.net.http.HttpClient;
+import java.security.NoSuchAlgorithmException;
+import org.testng.annotations.Test;
+import static org.testng.Assert.expectThrows;
+import static org.testng.Assert.fail;
+
+/*
+ * @test
+ * @bug 8251715
+ * @summary This test verifies exception when resources for
+ * SSLcontext used by HttpClient are not available
+ * @build SSLExceptionTest
+ * @run testng/othervm -Djdk.tls.client.protocols="InvalidTLSv1.4"
+ *                      SSLExceptionTest
+ */
+
+public class SSLExceptionTest  {
+
+    Throwable excp,noSuchAlgo;
+
+    static final int ITERATIONS = 10;
+
+    @Test
+    public void testHttpClientsslException() {
+        for (int i = 0; i < ITERATIONS; i++) {
+            excp = expectThrows(UncheckedIOException.class, HttpClient.newBuilder()::build);
+            noSuchAlgo = excp.getCause().getCause();
+            if ( !(noSuchAlgo instanceof NoSuchAlgorithmException) ) {
+                fail("Test failed due to wrong exception cause : " + noSuchAlgo);
+            }
+            excp = expectThrows(UncheckedIOException.class, HttpClient::newHttpClient);
+            noSuchAlgo = excp.getCause().getCause();
+            if ( !(noSuchAlgo instanceof NoSuchAlgorithmException) ) {
+                fail("Test failed due to wrong exception cause : " + noSuchAlgo);
+            }
+        }
+    }
+}
+