# HG changeset patch # User ascarpino # Date 1476131324 25200 # Node ID 509c0e9a6b47fc2ddd03d1c59277cb45f28cecd2 # Parent 62969f0fb9c552255b52746df017c95644e1b8d0 8165101: AnchorCertificates throws NPE when cacerts file not found Reviewed-by: mullan diff -r 62969f0fb9c5 -r 509c0e9a6b47 jdk/src/java.base/share/classes/sun/security/util/AnchorCertificates.java --- a/jdk/src/java.base/share/classes/sun/security/util/AnchorCertificates.java Mon Oct 10 00:45:13 2016 -0700 +++ b/jdk/src/java.base/share/classes/sun/security/util/AnchorCertificates.java Mon Oct 10 13:28:44 2016 -0700 @@ -31,8 +31,10 @@ import java.security.KeyStore; import java.security.PrivilegedAction; import java.security.cert.X509Certificate; +import java.util.Collections; import java.util.Enumeration; import java.util.HashSet; +import java.util.Set; import sun.security.x509.X509CertImpl; @@ -44,7 +46,7 @@ private static final Debug debug = Debug.getInstance("certpath"); private static final String HASH = "SHA-256"; - private static HashSet certs; + private static Set certs = Collections.emptySet(); static { AccessController.doPrivileged(new PrivilegedAction() {