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

@ -15,9 +15,9 @@
package google.registry.server;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.throwIfInstanceOf;
import static google.registry.util.TypeUtils.instantiate;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.Uninterruptibles;
import java.io.IOException;
@ -86,9 +86,9 @@ public final class ServletWrapperDelegatorServlet extends HttpServlet {
try {
Uninterruptibles.getUninterruptibly(task);
} catch (ExecutionException e) {
Throwables.propagateIfInstanceOf(e.getCause(), ServletException.class);
Throwables.propagateIfInstanceOf(e.getCause(), IOException.class);
throw Throwables.propagate(e.getCause());
throwIfInstanceOf(e.getCause(), ServletException.class);
throwIfInstanceOf(e.getCause(), IOException.class);
throw new RuntimeException(e.getCause());
}
}
}