[infinispan-commits] Infinispan SVN: r2441 - branches/4.2.x/core/src/main/java/org/infinispan/atomic.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-09-27 11:34:31 -0400 (Mon, 27 Sep 2010)
New Revision: 2441

Modified:
   branches/4.2.x/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
Log:
ISPN-672 - NPE in AtomicHashMapDelta.merge caused by TreeCache.put(Fqn, new HashMap())


Modified: branches/4.2.x/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java	2010-09-27 15:28:14 UTC (rev 2440)
+++ branches/4.2.x/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java	2010-09-27 15:34:31 UTC (rev 2441)
@@ -54,8 +54,9 @@
          other = (AtomicHashMap) d;
       else
          other = new AtomicHashMap();
-
-      for (Operation o : changeLog) o.replay(other.delegate);
+      if (changeLog != null) {
+         for (Operation o : changeLog) o.replay(other.delegate);
+      }
       other.commit();
       return other;
    }