CR

Author: panchenko

core/src/main/java/io/grpc/internal/CloseWithHeadersMarker.java

@@ -22,7 +22,7 @@
  * Marker to be used in {@link Status#withCause(Throwable)} to signal that stream should be closed
  * by sending headers.
  */
-public class CloseWithHeadersMarker extends RuntimeException {
+public class CloseWithHeadersMarker extends Throwable {
   private static final long serialVersionUID = 0L;
 
   @Override

core/src/main/java/io/grpc/internal/ServerCallImpl.java

@@ -279,7 +279,12 @@ private void handleInternalError(Throwable internalError) {
     serverCallTracer.reportCallEnded(false); // error so always false
   }
 
+  /**
+   * Close the {@link ServerStream} because parsing request message failed.
+   * Similar to {@link #handleInternalError(Throwable)}.
+   */
   private void handleParseError(StatusRuntimeException parseError) {
+    cancelled = true;
     log.log(Level.WARNING, "Cancelling the stream because of parse error", parseError);
     stream.cancel(parseError.getStatus().withCause(new CloseWithHeadersMarker()));
     serverCallTracer.reportCallEnded(false); // error so always false
@@ -342,7 +347,6 @@ private void messagesAvailableInternal(final MessageProducer producer) {
           } catch (StatusRuntimeException e) {
             GrpcUtil.closeQuietly(message);
             GrpcUtil.closeQuietly(producer);
-            call.cancelled = true;
             call.handleParseError(e);
             return;
           }