From 6b523e48f0232f91413071d7a59d2102f37531ba Mon Sep 17 00:00:00 2001 From: bong01 <0409gb@gmail.com> Date: Sun, 9 Feb 2025 09:10:34 +0900 Subject: [PATCH] preserve original status cause --- stub/src/main/java/io/grpc/kotlin/ClientCalls.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/stub/src/main/java/io/grpc/kotlin/ClientCalls.kt b/stub/src/main/java/io/grpc/kotlin/ClientCalls.kt index 3dce6967..96c34bae 100644 --- a/stub/src/main/java/io/grpc/kotlin/ClientCalls.kt +++ b/stub/src/main/java/io/grpc/kotlin/ClientCalls.kt @@ -20,7 +20,6 @@ import io.grpc.CallOptions import io.grpc.ClientCall import io.grpc.MethodDescriptor import io.grpc.Status -import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.cancel @@ -28,7 +27,6 @@ import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.onFailure import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -296,7 +294,7 @@ object ClientCalls { val cause = when { status.isOk -> null - status.cause is CancellationException -> status.cause + status.cause != null -> status.cause else -> status.asException(trailersMetadata) } responses.close(cause = cause)