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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-10-27 13:02:35 -0400 (Wed, 27 Oct 2010)
New Revision: 2620

Modified:
   trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java
Log:
fixed regressions related to ISPN-738 (merged from branch 4.2.x, r2619)

Modified: trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java	2010-10-27 17:01:51 UTC (rev 2619)
+++ trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java	2010-10-27 17:02:35 UTC (rev 2620)
@@ -193,7 +193,7 @@
    private void lockKeysForLockCommand(TxInvocationContext ctx, LockControlCommand c) throws InterruptedException {
       for (Object key : c.getKeys()) {
          MVCCEntry e = entryFactory.wrapEntryForWriting(ctx, key, true, false, false, false, false);
-         if (e.isCreated()) {
+         if (e != null && e.isCreated()) {
             // mark as temporary entry just for the sake of a lock command
             e.setLockPlaceholder(true);
          }