From c0fc6785c162b95cfe9277b975028cb94c164d8c Mon Sep 17 00:00:00 2001 From: zpencer Date: Mon, 5 Jun 2017 08:37:51 -0700 Subject: [PATCH] core: JumpToApplicationThreadServerStreamListener should not close context (#3055) Calling CancellableContext#close() multiple times does not cause problems, but is unnecessary here. The return value of getListener() is a ServerStreamListenerImpl, which already calls CancellableContext#cancel() inside of the finally block of ServerStreamListener#closed(). --- core/src/main/java/io/grpc/internal/ServerImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java index 7dc162e5af..99bf32025d 100644 --- a/core/src/main/java/io/grpc/internal/ServerImpl.java +++ b/core/src/main/java/io/grpc/internal/ServerImpl.java @@ -585,9 +585,6 @@ public final class ServerImpl extends io.grpc.Server implements WithLogId { callExecutor.execute(new ContextRunnable(context) { @Override public void runInContext() { - if (status.isOk()) { - context.cancel(status.getCause()); - } getListener().closed(status); } });