netty: avoid unintentionally NullPointerException (#3932)

grpc · Jan 17, 2018 · b5ae134 · b5ae134
1 parent c51b927
commit b5ae134
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/netty/src/main/java/io/grpc/netty/NettyServerHandler.java b/netty/src/main/java/io/grpc/netty/NettyServerHandler.java
@@ -31,6 +31,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import io.grpc.Attributes;
 import io.grpc.InternalMetadata;
 import io.grpc.InternalStatus;
@@ -710,7 +711,7 @@ private NettyServerStream.TransportState serverStream(Http2Stream stream) {
 
   private Http2Exception newStreamException(int streamId, Throwable cause) {
     return Http2Exception.streamError(
-        streamId, Http2Error.INTERNAL_ERROR, cause, cause.getMessage());
+        streamId, Http2Error.INTERNAL_ERROR, cause, Strings.nullToEmpty(cause.getMessage()));
   }
 
   private class FrameListener extends Http2FrameAdapter {