Handle exceptions in after

1 files changed, 15 insertions, 1 deletions

diff --git a/gae-interop-testing/gae-jdk7/src/main/java/io/grpc/testing/integration/OkHttpClientInteropServlet.java b/gae-interop-testing/gae-jdk7/src/main/java/io/grpc/testing/integration/OkHttpClientInteropServlet.java
index 252bb1c80..a0243049f 100644
--- a/gae-interop-testing/gae-jdk7/src/main/java/io/grpc/testing/integration/OkHttpClientInteropServlet.java
+++ b/gae-interop-testing/gae-jdk7/src/main/java/io/grpc/testing/integration/OkHttpClientInteropServlet.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue;
 
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
+import io.grpc.internal.MoreThrowables;
 import io.grpc.okhttp.OkHttpChannelBuilder;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -181,8 +182,21 @@ public final class OkHttpClientInteropServlet extends HttpServlet {
     return new AutoCloseable() {
       @Override
       public void close() throws Exception {
+        Throwable failure = null;
         for (Method method : methods) {
-          method.invoke(o);
+          try {
+            method.invoke(o);
+          } catch (Throwable t) {
+            if (failure == null) {
+              failure = t;
+            } else {
+              failure.addSuppressed(t);
+            }
+          }
+        }
+        if (failure != null) {
+          MoreThrowables.throwIfUnchecked(failure);
+          throw new Exception(failure);
         }
       }
     };