Invoke call.close only if call was not cancelled

grpc · Feb 26, 2025 · dbcaccb · dbcaccb
1 parent 88dee44
commit dbcaccb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/stub/src/main/java/io/grpc/kotlin/ServerCalls.kt b/stub/src/main/java/io/grpc/kotlin/ServerCalls.kt
@@ -265,7 +265,9 @@ object ServerCalls {
         else -> Status.fromThrowable(failure).withCause(failure)
       }
       val trailers = failure?.let { Status.trailersFromThrowable(it) } ?: GrpcMetadata()
-      mutex.withLock { call.close(closeStatus, trailers) }
+      mutex.withLock {
+        if (!call.isCancelled) call.close(closeStatus, trailers)
+      }
     }
 
     return object: ServerCall.Listener<RequestT>() {