[infinispan-commits] Infinispan SVN: r2619 - branches/4.2.x/core/src/main/java/org/infinispan/interceptors.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed Oct 27 13:01:52 EDT 2010
Author: manik.surtani at jboss.com
Date: 2010-10-27 13:01:51 -0400 (Wed, 27 Oct 2010)
New Revision: 2619
Modified:
branches/4.2.x/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java
Log:
fixed regressions related to ISPN-738
Modified: branches/4.2.x/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java 2010-10-27 16:38:05 UTC (rev 2618)
+++ branches/4.2.x/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java 2010-10-27 17:01:51 UTC (rev 2619)
@@ -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);
}
More information about the infinispan-commits
mailing list