Replace Throwables.propagate and variants with Guava 20 versions

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=146250470
This commit is contained in:
cgoldfeder 2017-02-01 09:11:42 -08:00 committed by Ben McIlwain
parent a061f74ee7
commit e2e37dc9f3
8 changed files with 25 additions and 20 deletions

View file

@ -16,7 +16,7 @@ package google.registry.util;
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.propagateIfInstanceOf;
import static com.google.common.base.Throwables.throwIfInstanceOf;
import static com.google.common.io.BaseEncoding.base64;
import static java.nio.charset.StandardCharsets.US_ASCII;
@ -76,7 +76,7 @@ public final class X509Utils {
.from(CertificateFactory.getInstance("X.509").generateCertificates(input))
.filter(X509Certificate.class));
} catch (CertificateException e) { // CertificateParsingException by specification.
propagateIfInstanceOf(e, CertificateParsingException.class);
throwIfInstanceOf(e, CertificateParsingException.class);
throw new CertificateParsingException(e);
} catch (NoSuchElementException e) {
throw new CertificateParsingException("No X509Certificate found.");