From 4ecb28ccdce9f323752ac5b8385f68a40bfb4183 Mon Sep 17 00:00:00 2001
From: Kevin Driver <kdriver@openjdk.org>
Date: Tue, 10 Dec 2024 21:14:37 +0000
Subject: [PATCH] 8344924: Default CA certificates loaded despite request to
 use custom keystore

Reviewed-by: mullan
Backport-of: 4c39e9faa0cb8e4fd00d8b9dc0ac5ad64d6b287d
---
 .../classes/sun/security/ssl/X509TrustManagerImpl.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
index ee19ff62a38..58794e5dce8 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
@@ -25,7 +25,6 @@
 
 package sun.security.ssl;
 
-import java.lang.invoke.MethodHandles;
 import java.net.Socket;
 import java.security.*;
 import java.security.cert.*;
@@ -52,15 +51,6 @@ import sun.security.validator.*;
 final class X509TrustManagerImpl extends X509ExtendedTrustManager
         implements X509TrustManager {
 
-    static {
-        // eagerly initialize to avoid pinning virtual thread during TLS handshake
-        try {
-            MethodHandles.lookup().ensureInitialized(AnchorCertificates.class);
-        } catch (IllegalAccessException e) {
-            throw new ExceptionInInitializerError(e);
-        }
-    }
-
     private final String validatorType;
 
     /**