core: Avoid wrapping Errors in RuntimeException

grpc · Sep 13, 2016 · 22393f9 · 22393f9
1 parent c14edca
commit 22393f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
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
@@ -363,10 +363,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);
             }
@@ -486,9 +486,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;
           }
         }
       });
@@ -504,9 +504,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;
           }
         }
       });