core: Avoid wrapping Errors in RuntimeException

ejona86 · ejona86 · commit d394cef77508 · 2016-08-04T14:25:40.000-07:00
diff --git a/core/src/main/java/io/grpc/internal/LogExceptionRunnable.java b/core/src/main/java/io/grpc/internal/LogExceptionRunnable.java
@@ -33,6 +33,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.base.Throwables;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -56,7 +58,8 @@ public void run() {
       task.run();
     } catch (Throwable t) {
       log.log(Level.SEVERE, "Exception while executing runnable " + task, t);
-      throw t instanceof RuntimeException ? (RuntimeException) t : new RuntimeException(t);
+      Throwables.propagateIfPossible(t);
+      throw new AssertionError(t);
     }
   }
 
diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java
@@ -364,10 +364,10 @@ public void runInContext() {
               stream.close(Status.fromThrowable(e), new Metadata());
               context.cancel(null);
               throw e;
-            } catch (Throwable t) {
-              stream.close(Status.fromThrowable(t), new Metadata());
+            } catch (Error e) {
+              stream.close(Status.fromThrowable(e), new Metadata());
               context.cancel(null);
-              throw new RuntimeException(t);
+              throw e;
             } finally {
               jumpListener.setListener(listener);
             }
@@ -487,9 +487,9 @@ public void runInContext() {
           } catch (RuntimeException e) {
             internalClose(Status.fromThrowable(e), new Metadata());
             throw e;
-          } catch (Throwable t) {
-            internalClose(Status.fromThrowable(t), new Metadata());
-            throw new RuntimeException(t);
+          } catch (Error e) {
+            internalClose(Status.fromThrowable(e), new Metadata());
+            throw e;
           }
         }
       });
@@ -505,9 +505,9 @@ public void runInContext() {
           } catch (RuntimeException e) {
             internalClose(Status.fromThrowable(e), new Metadata());
             throw e;
-          } catch (Throwable t) {
-            internalClose(Status.fromThrowable(t), new Metadata());
-            throw new RuntimeException(t);
+          } catch (Error e) {
+            internalClose(Status.fromThrowable(e), new Metadata());
+            throw e;
           }
         }
       });

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@`
`33`	`33`
`34`	`34`	`import static com.google.common.base.Preconditions.checkNotNull;`
`35`	`35`
	`36`	`+import com.google.common.base.Throwables;`
	`37`	`+`
`36`	`38`	`import java.util.logging.Level;`
`37`	`39`	`import java.util.logging.Logger;`
`38`	`40`
`@@ -56,7 +58,8 @@ public void run() {`
`56`	`58`	`task.run();`
`57`	`59`	`} catch (Throwable t) {`
`58`	`60`	`log.log(Level.SEVERE, "Exception while executing runnable " + task, t);`
`59`		`- throw t instanceof RuntimeException ? (RuntimeException) t : new RuntimeException(t);`
	`61`	`+ Throwables.propagateIfPossible(t);`
	`62`	`+ throw new AssertionError(t);`
`60`	`63`	`}`
`61`	`64`	`}`
`62`	`65`