Merge pull request #40860 from gimantha/transaction-strands-4.x

[4.x]Propagate transactional mode properly in between strands
ballerina-platform · Jul 6, 2023 · 06723e2 · 06723e2
2 parents 8c55736 + 2ee948b
commit 06723e2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Strand.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Strand.java
@@ -191,8 +191,10 @@ public void removeLocalTransactionContext() {
     public void removeCurrentTrxContext() {
         if (!this.trxContexts.isEmpty()) {
             this.currentTrxContext = this.trxContexts.pop();
+            globalProps.put(CURRENT_TRANSACTION_CONTEXT_PROPERTY, this.currentTrxContext);
             return;
         }
+        globalProps.remove(CURRENT_TRANSACTION_CONTEXT_PROPERTY);
         this.currentTrxContext = null;
     }