Use return value of Status.augmentDescription

Author: ejona86

netty/src/main/java/io/grpc/netty/NettyClientHandler.java

@@ -499,8 +499,8 @@ private void cancelPing(Throwable t) {
   }
 
   private Status statusFromGoAway(long errorCode, byte[] debugData) {
-    Status status = GrpcUtil.Http2Error.statusForCode((int) errorCode);
-    status.augmentDescription("Received Goaway");
+    Status status = GrpcUtil.Http2Error.statusForCode((int) errorCode)
+        .augmentDescription("Received Goaway");
     if (debugData != null && debugData.length > 0) {
       // If a debug message was provided, use it.
       String msg = new String(debugData, UTF_8);

netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java

@@ -61,7 +61,6 @@
 import io.grpc.StatusException;
 import io.grpc.internal.ClientTransport;
 import io.grpc.internal.ClientTransport.PingCallback;
-import io.grpc.internal.GrpcUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
@@ -271,7 +270,8 @@ public void receivedGoAwayShouldCancelBufferedStream() throws Exception {
     assertTrue(future.isDone());
     assertFalse(future.isSuccess());
     Status status = Status.fromThrowable(future.cause());
-    assertEquals(GrpcUtil.Http2Error.NO_ERROR.status(), status);
+    assertEquals(Status.Code.UNAVAILABLE, status.getCode());
+    assertEquals("HTTP/2 error code: NO_ERROR\nReceived Goaway", status.getDescription());
   }
 
   @Test
@@ -284,7 +284,7 @@ public void receivedGoAwayShouldFailUnknownStreams() throws Exception {
     verify(stream).transportReportStatus(captor.capture(), eq(false),
         notNull(Metadata.class));
     assertEquals(Status.CANCELLED.getCode(), captor.getValue().getCode());
-    assertEquals("HTTP/2 error code: CANCEL\nthis is a test",
+    assertEquals("HTTP/2 error code: CANCEL\nReceived Goaway\nthis is a test",
         captor.getValue().getDescription());
   }
 
@@ -300,7 +300,8 @@ public void receivedGoAwayShouldFailUnknownBufferedStreams() throws Exception {
     assertFalse(future.isSuccess());
     Status status = Status.fromThrowable(future.cause());
     assertEquals(Status.CANCELLED.getCode(), status.getCode());
-    assertEquals("HTTP/2 error code: CANCEL\nthis is a test", status.getDescription());
+    assertEquals("HTTP/2 error code: CANCEL\nReceived Goaway\nthis is a test",
+        status.getDescription());
   }
 
   @Test
@@ -314,7 +315,8 @@ public void receivedGoAwayShouldFailNewStreams() throws Exception {
     assertFalse(future.isSuccess());
     Status status = Status.fromThrowable(future.cause());
     assertEquals(Status.CANCELLED.getCode(), status.getCode());
-    assertEquals("HTTP/2 error code: CANCEL\nthis is a test", status.getDescription());
+    assertEquals("HTTP/2 error code: CANCEL\nReceived Goaway\nthis is a test",
+        status.getDescription());
   }
 
   @Test

okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java

@@ -785,11 +785,11 @@ public void ackSettings() {
 
     @Override
     public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData) {
-      Status status = GrpcUtil.Http2Error.statusForCode(errorCode.httpCode);
-      status.augmentDescription("Received Goaway");
+      Status status = GrpcUtil.Http2Error.statusForCode(errorCode.httpCode)
+          .augmentDescription("Received Goaway");
       if (debugData != null && debugData.size() > 0) {
         // If a debug message was provided, use it.
-        status.augmentDescription(debugData.utf8());
+        status = status.augmentDescription(debugData.utf8());
       }
       startGoAway(lastGoodStreamId, status);
     }