Invoke call.close only if call was not cancelled

mopfattn · Marco Pfattner · commit 36453769b03c · 2025-02-28T08:26:39.000+01:00
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>() {

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,9 @@ object ServerCalls {`
`265`	`265`	`else -> Status.fromThrowable(failure).withCause(failure)`
`266`	`266`	`}`
`267`	`267`	`val trailers = failure?.let { Status.trailersFromThrowable(it) } ?: GrpcMetadata()`
`268`		`- mutex.withLock { call.close(closeStatus, trailers) }`
	`268`	`+ mutex.withLock {`
	`269`	`+ if (!call.isCancelled) call.close(closeStatus, trailers)`
	`270`	`+ }`
`269`	`271`	`}`
`270`	`272`
`271`	`273`	`return object: ServerCall.Listener<RequestT>() {`