infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-04 12:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8345954: Addressing review comments

Browse Source
This commit is contained in:
Koushik Thirupattur 2026-01-22 15:46:53 -08:00
parent ef780e2c44
commit bf2ccdab43
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/java.base/share/classes/sun/security/provider/X509Factory.java
View File

@ -89,9 +89,7 @@ public class X509Factory extends CertificateFactorySpi {
{
if (is == null) {
// clear the caches (for debugging)
synchronized (certCache) {
certCache.clear();
}
certCache.clear();
X509CertificatePair.clearCache();
throw new CertificateException("Missing input stream");
}
@ -117,7 +115,7 @@ public class X509Factory extends CertificateFactorySpi {
// Build outside lock
X509CertImpl newCert = new X509CertImpl(encoding);
byte[] enc = newCert.getEncodedInternal();
return addToCache(certCache, enc, newCert);
return addIfNotPresent(certCache, enc, newCert);
}
/**
@ -178,9 +176,16 @@ public class X509Factory extends CertificateFactorySpi {
}
// Build outside lock
X509CertImpl newC = isImpl ? (X509CertImpl) c : new X509CertImpl(encoding);
byte[] enc = isImpl ? encoding : newC.getEncodedInternal();
return addToCache(certCache, enc, newC);
X509CertImpl newC;
byte[] enc;
if (isImpl) {
newC = (X509CertImpl) c;
enc = encoding;
} else {
newC = new X509CertImpl(encoding);
enc = newC.getEncodedInternal();
}
return addIfNotPresent(certCache, enc, newC);
}
/**
@ -210,9 +215,16 @@ public class X509Factory extends CertificateFactorySpi {
return cached;
}
X509CRLImpl newC = isImpl ? (X509CRLImpl) c : new X509CRLImpl(encoding);
byte[] enc = isImpl ? encoding : newC.getEncodedInternal();
return addToCache(crlCache, enc, newC);
X509CRLImpl newC;
byte[] enc;
if (isImpl) {
newC = (X509CRLImpl) c;
enc = encoding;
} else {
newC = new X509CRLImpl(encoding);
enc = newC.getEncodedInternal();
}
return addIfNotPresent(crlCache, enc, newC);
}
/**
@ -227,7 +239,7 @@ public class X509Factory extends CertificateFactorySpi {
/**
* Add the X509CertImpl or X509CRLImpl to the cache.
*/
private static <V> V addToCache(Cache<Object, V> cache, byte[] encoding, V value) {
private static <V> V addIfNotPresent(Cache<Object, V> cache, byte[] encoding, V value) {
if (encoding.length > ENC_MAX_LENGTH) {
return value;
}
@ -242,7 +254,6 @@ public class X509Factory extends CertificateFactorySpi {
}
}
/**
* Generates a <code>CertPath</code> object and initializes it with
* the data read from the <code>InputStream</code> inStream. The data
@ -387,9 +398,7 @@ public class X509Factory extends CertificateFactorySpi {
{
if (is == null) {
// clear the cache (for debugging)
synchronized (crlCache) {
crlCache.clear();
}
crlCache.clear();
throw new CRLException("Missing input stream");
}
try {
@ -402,7 +411,7 @@ public class X509Factory extends CertificateFactorySpi {
// Build outside lock
X509CRLImpl crl = new X509CRLImpl(encoding);
byte[] enc = crl.getEncodedInternal();
return addToCache(crlCache, enc, crl);
return addIfNotPresent(crlCache, enc, crl);
} else {
throw new IOException("Empty input");
}