Allow termination under execution because of reentrancy in tests.

Callback can be executed synchronously inside `send`
JetBrains · Oct 19, 2023 · d229513 · d229513
1 parent 1c4c9c7
commit d229513
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/rd-kt/rd-framework/src/main/kotlin/com/jetbrains/rd/framework/impl/RdTask.kt b/rd-kt/rd-framework/src/main/kotlin/com/jetbrains/rd/framework/impl/RdTask.kt
@@ -369,7 +369,7 @@ class RdCall<TReq, TRes>(internal val requestSzr: ISerializer<TReq> = Polymorphi
         val task = CallSiteWiredRdTask(intersectedDef.lifetime, this, taskId, scheduler ?: proto.scheduler)
         task.result.advise(intersectedDef.lifetime) {
             if (it !is RdTaskResult.Success || !it.value.isBindable()) {
-                intersectedDef.terminate()
+                intersectedDef.terminate(true)
             }
         }
         intersectedDef.lifetime.executeIfAlive {

diff --git a/rd-net/RdFramework/Tasks/RdCall.cs b/rd-net/RdFramework/Tasks/RdCall.cs
@@ -205,7 +205,10 @@ private IRdTask<TRes> StartInternal(Lifetime requestLifetime, TReq request, ISch
       task.Result.Advise(intersectedDef.Lifetime, result =>
       {
         if (result.Status != RdTaskStatus.Success || !result.Result.IsBindable())
+        {
+          intersectedDef.AllowTerminationUnderExecution = true;
           intersectedDef.Terminate();
+        }
       });
 
       using var cookie = intersectedDef.UsingExecuteIfAlive();