stub: Avoid double-wrapping status

ejona86 · ejona86 · commit fb8402fcb130 · 2016-08-01T09:53:57.000-07:00
780b269 caused all failures for blocked unary stubs to have a StatusRuntimeException as the cause of the StatusRuntimeException, with the two exceptions having almost the same status.
diff --git a/stub/src/main/java/io/grpc/stub/ClientCalls.java b/stub/src/main/java/io/grpc/stub/ClientCalls.java
@@ -224,10 +224,10 @@ private static StatusRuntimeException toStatusRuntimeException(Throwable t) {
       // If we have an embedded status, use it and replace the cause
       if (cause instanceof StatusException) {
         StatusException se = (StatusException) cause;
-        return new StatusRuntimeException(se.getStatus().withCause(t), se.getTrailers());
+        return new StatusRuntimeException(se.getStatus(), se.getTrailers());
       } else if (cause instanceof StatusRuntimeException) {
         StatusRuntimeException se = (StatusRuntimeException) cause;
-        return new StatusRuntimeException(se.getStatus().withCause(t), se.getTrailers());
+        return new StatusRuntimeException(se.getStatus(), se.getTrailers());
       }
       cause = cause.getCause();
     }
diff --git a/stub/src/test/java/io/grpc/stub/ClientCallsTest.java b/stub/src/test/java/io/grpc/stub/ClientCallsTest.java
@@ -139,7 +139,7 @@ public Void answer(InvocationOnMock in) throws Throwable {
   @Test
   public void unaryBlockingCallFailed() throws Exception {
     Integer req = 2;
-    final Status status = Status.INTERNAL;
+    final Status status = Status.INTERNAL.withDescription("Unique status");
     final Metadata trailers = new Metadata();
 
     doAnswer(new Answer<Void>() {
@@ -156,7 +156,7 @@ public Void answer(InvocationOnMock in) throws Throwable {
       ClientCalls.blockingUnaryCall(call, req);
       fail("Should fail");
     } catch (StatusRuntimeException e) {
-      assertSame(status.getCode(), e.getStatus().getCode());
+      assertSame(status, e.getStatus());
       assertSame(trailers, e.getTrailers());
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -224,10 +224,10 @@ private static StatusRuntimeException toStatusRuntimeException(Throwable t) {`
`224`	`224`	`// If we have an embedded status, use it and replace the cause`
`225`	`225`	`if (cause instanceof StatusException) {`
`226`	`226`	`StatusException se = (StatusException) cause;`
`227`		`- return new StatusRuntimeException(se.getStatus().withCause(t), se.getTrailers());`
	`227`	`+ return new StatusRuntimeException(se.getStatus(), se.getTrailers());`
`228`	`228`	`} else if (cause instanceof StatusRuntimeException) {`
`229`	`229`	`StatusRuntimeException se = (StatusRuntimeException) cause;`
`230`		`- return new StatusRuntimeException(se.getStatus().withCause(t), se.getTrailers());`
	`230`	`+ return new StatusRuntimeException(se.getStatus(), se.getTrailers());`
`231`	`231`	`}`
`232`	`232`	`cause = cause.getCause();`
`233`	`233`	`}`