Sorting the transformable set to avoid deadlock

apache · Aug 3, 2023 · 1011768 · 1011768
1 parent 5b13798
commit 1011768
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/...ls-persistence-api/src/main/java/org/drools/persistence/api/TransactionManagerHelper.java b/...ls-persistence-api/src/main/java/org/drools/persistence/api/TransactionManagerHelper.java
@@ -15,14 +15,12 @@
 
 package org.drools.persistence.api;
 
-import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.Set;
+import java.util.TreeSet;
 
 public class TransactionManagerHelper {
 
     private static final String APP_UPDETEABLE_RESOURCE = "app-updateable-resource";
-    private static final String CMD_UPDETEABLE_RESOURCE = "cmd-updateable-resource";
 
     public static void registerTransactionSyncInContainer(TransactionManager txm, OrderedTransactionSynchronization synchronization) {
         TransactionSynchronizationContainer container = (TransactionSynchronizationContainer)txm.getResource(TransactionSynchronizationContainer.RESOURCE_KEY);
@@ -41,7 +39,10 @@ public static void addToUpdatableSet(TransactionManager txm, Transformable trans
         }
         Set<Transformable> toBeUpdated = (Set<Transformable>) txm.getResource(APP_UPDETEABLE_RESOURCE);
         if (toBeUpdated == null) {
-            toBeUpdated = new LinkedHashSet<Transformable>();
+            toBeUpdated = new TreeSet<>((o1, o2) -> {
+                int result = o1.getClass().getSimpleName().compareTo(o2.getClass().getSimpleName());
+                return result == 0 ? 1 : result;
+            });
             txm.putResource(APP_UPDETEABLE_RESOURCE, toBeUpdated);
         }
         toBeUpdated.add(transformable);
@@ -58,11 +59,6 @@ public static void removeFromUpdatableSet(TransactionManager txm, Transformable
 
     @SuppressWarnings("unchecked")
     public static Set<Transformable> getUpdateableSet(TransactionManager txm) {
-        Set<Transformable> toBeUpdated = (Set<Transformable>) txm.getResource(APP_UPDETEABLE_RESOURCE);
-        if (toBeUpdated == null) {
-            return Collections.emptySet();
-        }
-
-        return new LinkedHashSet<Transformable>(toBeUpdated);
+        return (Set<Transformable>) txm.getResource(APP_UPDETEABLE_RESOURCE);
     }
 }