[infinispan-commits] Infinispan SVN: r1063 - trunk/core/src/main/java/org/infinispan/interceptors.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-10-29 08:19:19 -0400 (Thu, 29 Oct 2009)
New Revision: 1063

Modified:
   trunk/core/src/main/java/org/infinispan/interceptors/DistLockingInterceptor.java
Log:
[ISPN-240] (Removals not working as expected when L1 is disabled)

Modified: trunk/core/src/main/java/org/infinispan/interceptors/DistLockingInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/DistLockingInterceptor.java	2009-10-29 12:06:43 UTC (rev 1062)
+++ trunk/core/src/main/java/org/infinispan/interceptors/DistLockingInterceptor.java	2009-10-29 12:19:19 UTC (rev 1063)
@@ -22,7 +22,17 @@
 
    @Override
    protected void commitEntry(InvocationContext ctx, CacheEntry entry) {
-      if (!dm.isLocal(entry.getKey())) dm.transformForL1(entry);
-      entry.commit(dataContainer);
+      boolean doCommit = true;
+      if (!dm.isLocal(entry.getKey())) {
+         if (configuration.isL1CacheEnabled()) {
+            dm.transformForL1(entry);
+         } else {
+            doCommit = false;
+         }
+      }
+      if (doCommit)
+         entry.commit(dataContainer);
+      else
+         entry.rollback();
    }
 }