Remove "catch (FooException e); throwIfInstanceOf(e, FooException.class)" and just let the FooException propagate naturally.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=124847480
This commit is contained in:
Kurt Kluever 2016-06-14 09:36:16 -07:00 committed by Justine Tunney
parent c70d167a99
commit cc01035fe8

View file

@ -33,7 +33,6 @@ import java.security.GeneralSecurityException;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.cert.CRLException; import java.security.cert.CRLException;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory; import java.security.cert.CertificateFactory;
import java.security.cert.CertificateParsingException; import java.security.cert.CertificateParsingException;
@ -140,12 +139,7 @@ public final class X509Utils {
X509Certificate rootCert, X509CRL crl, @Tainted X509Certificate cert, Date now) X509Certificate rootCert, X509CRL crl, @Tainted X509Certificate cert, Date now)
throws GeneralSecurityException { throws GeneralSecurityException {
cert.checkValidity(checkNotNull(now, "now")); cert.checkValidity(checkNotNull(now, "now"));
try { cert.verify(rootCert.getPublicKey());
cert.verify(rootCert.getPublicKey());
} catch (CertificateException e) {
propagateIfInstanceOf(e, CertificateException.class);
throw new CertificateEncodingException(e); // Coercion by specification.
}
if (crl.isRevoked(cert)) { if (crl.isRevoked(cert)) {
X509CRLEntry entry = crl.getRevokedCertificate(cert); X509CRLEntry entry = crl.getRevokedCertificate(cert);
throw new CertificateRevokedException( throw new CertificateRevokedException(