mirror of
https://github.com/google/nomulus
synced 2026-05-29 11:10:30 +00:00
Revert Guava 20 features until we get the build working properly
*** Original change description *** Remove deprecated methods with Guava 20 release *** ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=137945126
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
|
||||
package google.registry.tmch;
|
||||
|
||||
import static com.google.common.base.Throwables.throwIfInstanceOf;
|
||||
import static com.google.common.base.Throwables.propagateIfInstanceOf;
|
||||
import static google.registry.util.CacheUtils.memoizeWithLongExpiration;
|
||||
import static google.registry.util.CacheUtils.memoizeWithShortExpiration;
|
||||
import static google.registry.util.ResourceUtils.readResourceUtf8;
|
||||
@@ -125,7 +125,7 @@ public final class TmchCertificateAuthority {
|
||||
try {
|
||||
return ROOT_CACHE.get();
|
||||
} catch (RuntimeException e) {
|
||||
throwIfInstanceOf(e.getCause(), GeneralSecurityException.class);
|
||||
propagateIfInstanceOf(e.getCause(), GeneralSecurityException.class);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
@@ -134,7 +134,7 @@ public final class TmchCertificateAuthority {
|
||||
try {
|
||||
return CRL_CACHE.get();
|
||||
} catch (RuntimeException e) {
|
||||
throwIfInstanceOf(e.getCause(), GeneralSecurityException.class);
|
||||
propagateIfInstanceOf(e.getCause(), GeneralSecurityException.class);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user