Merge pull request #41800 from rdulmina/transaction-issue

Remove the strandId when doing `generateCombinedTransactionId` in `TransactionResourceManager`
ballerina-platform · Jan 2, 2024 · d9700aa · d9700aa
2 parents 43483c5 + 8fa2ffa
commit d9700aa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...a-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java b/...a-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java
@@ -589,11 +589,11 @@ private void removeContextsFromRegistry(String transactionCombinedId, String gTr
     }
 
     private String generateCombinedTransactionId(String transactionId, String transactionBlockId) {
-        String compoundId =  transactionId + ":" + transactionBlockId;
         if (transactionBlockId.contains("_")) {
-            return compoundId;
+            // remove the strand id from the transaction block id
+            return transactionBlockId.split("_")[0];
         }
-        return compoundId + "_" + Scheduler.getStrand().getId();
+        return transactionId + ":" + transactionBlockId;
     }
 
     public void notifyResourceFailure(String gTransactionId) {