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

[infinispan-commits at lists.jboss.org]

Author: pvdyck
Date: 2010-04-15 09:52:57 -0400 (Thu, 15 Apr 2010)
New Revision: 1692

Modified:
   trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
Log:
[ISPN-401] (NPE in CacheStoreInterceptor)

Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java	2010-04-15 11:14:33 UTC (rev 1691)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java	2010-04-15 13:52:57 UTC (rev 1692)
@@ -21,6 +21,14 @@
  */
 package org.infinispan.interceptors;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.infinispan.commands.AbstractVisitor;
 import org.infinispan.commands.VisitableCommand;
 import org.infinispan.commands.tx.CommitCommand;
@@ -57,14 +65,6 @@
 import org.rhq.helpers.pluginAnnotations.agent.Metric;
 import org.rhq.helpers.pluginAnnotations.agent.Operation;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-
 /**
  * Writes modifications back to the store on the way out: stores modifications back through the CacheLoader, either
  * after each method call (no TXs), or at TX commit.
@@ -237,7 +237,8 @@
          throw new Exception("transactionContext for transaction " + gtx + " not found in transaction table");
       }
       List<WriteCommand> modifications = transactionContext.getModifications();
-      if (modifications.isEmpty()) {
+
+      if (transactionContext.hasModifications()) {
          if (trace) log.trace("Transaction has not logged any modifications!");
          return;
       }
@@ -307,6 +308,7 @@
       }
    }
 
+   @Override
    @ManagedOperation(description = "Resets statistics gathered by this component")
    @Operation(displayName = "Reset statistics")
    public void resetStatistics() {