Author: manik.surtani(a)jboss.com Date: 2009-09-24 12:40:14 -0400 (Thu, 24 Sep 2009) New Revision: 8239 Modified: core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java Log: [JBCACHE-1547] (0ms lock acquisition timeout ignored when using putForExternalRead and MVCC) Modified: core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java 2009-09-24 11:32:13 UTC (rev 8238) +++ core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java 2009-09-24 16:40:14 UTC (rev 8239) @@ -129,7 +129,8 @@ if (lockType == READ) return true; // we don't support read locks. if (trace) log.trace("Attempting to lock " + fqn); - if (lockContainer.acquireLock(fqn, lockAcquisitionTimeout, MILLISECONDS)) + + if (lockContainer.acquireLock(fqn, ctx.getLockAcquisitionTimeout(lockAcquisitionTimeout), MILLISECONDS)) { ctx.addLock(fqn); return true;