WFLY-11008 Cache.lock(...) requires an active transaction.

wildfly · Oct 11, 2018 · 418191f · 418191f
1 parent 47b1db0
commit 418191f
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/.../java/org/wildfly/clustering/web/infinispan/session/InfinispanSessionMetaDataFactory.java b/.../java/org/wildfly/clustering/web/infinispan/session/InfinispanSessionMetaDataFactory.java
@@ -22,7 +22,10 @@
 
 package org.wildfly.clustering.web.infinispan.session;
 
+import javax.transaction.SystemException;
+
 import org.infinispan.Cache;
+import org.infinispan.commons.CacheException;
 import org.infinispan.context.Flag;
 import org.infinispan.notifications.Listener;
 import org.infinispan.notifications.cachelistener.annotation.CacheEntriesEvicted;
@@ -117,12 +120,16 @@ public boolean purge(String id) {
 
     private boolean remove(String id, Cache<SessionCreationMetaDataKey, SessionCreationMetaDataEntry<L>> creationMetaDataCache) {
         SessionCreationMetaDataKey key = new SessionCreationMetaDataKey(id);
-        if (!this.properties.isLockOnWrite() || creationMetaDataCache.getAdvancedCache().withFlags(Flag.ZERO_LOCK_ACQUISITION_TIMEOUT, Flag.FAIL_SILENTLY).lock(key)) {
-            creationMetaDataCache.getAdvancedCache().withFlags(Flag.IGNORE_RETURN_VALUES).remove(key);
-            this.accessMetaDataCache.getAdvancedCache().withFlags(Flag.IGNORE_RETURN_VALUES).remove(new SessionAccessMetaDataKey(id));
-            return true;
+        try {
+            if (!this.properties.isLockOnWrite() || (creationMetaDataCache.getAdvancedCache().getTransactionManager().getTransaction() == null) || creationMetaDataCache.getAdvancedCache().withFlags(Flag.ZERO_LOCK_ACQUISITION_TIMEOUT, Flag.FAIL_SILENTLY).lock(key)) {
+                creationMetaDataCache.getAdvancedCache().withFlags(Flag.IGNORE_RETURN_VALUES).remove(key);
+                this.accessMetaDataCache.getAdvancedCache().withFlags(Flag.IGNORE_RETURN_VALUES).remove(new SessionAccessMetaDataKey(id));
+                return true;
+            }
+            return false;
+        } catch (SystemException e) {
+            throw new CacheException(e);
         }
-        return false;
     }
 
     @CacheEntriesEvicted