Author: manik.surtani(a)jboss.com
Date: 2008-06-25 09:48:34 -0400 (Wed, 25 Jun 2008)
New Revision: 6034
Modified:
core/trunk/src/main/java/org/jboss/cache/lock/NodeBasedLockManager.java
core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java
Log:
Updated to use new context APIs
Modified: core/trunk/src/main/java/org/jboss/cache/lock/NodeBasedLockManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/NodeBasedLockManager.java 2008-06-25
13:44:32 UTC (rev 6033)
+++ core/trunk/src/main/java/org/jboss/cache/lock/NodeBasedLockManager.java 2008-06-25
13:48:34 UTC (rev 6034)
@@ -104,14 +104,7 @@
NodeLock lock = acquireLock(node, lockType, getLockOwner(ctx),
ctx.getContextLockAcquisitionTimeout(lockAcquisitionTimeout));
if (lock != null)
{
- if (ctx.getTransactionEntry() != null)
- {
- ctx.getTransactionEntry().addLock(lock);
- }
- else
- {
- ctx.addLock(lock);
- }
+ ctx.addLock(lock);
return true;
}
else
@@ -208,14 +201,7 @@
if (locks.size() > 0)
{
- if (ctx.getGlobalTransaction() != null)
- {
- ctx.getTransactionEntry().addAllLocks(locks);
- }
- else
- {
- ctx.addAllLocks(locks);
- }
+ ctx.addAllLocks(locks);
}
return true;
Modified:
core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java 2008-06-25
13:44:32 UTC (rev 6033)
+++
core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java 2008-06-25
13:48:34 UTC (rev 6034)
@@ -237,17 +237,7 @@
{
NodeLock lock = node.getLock();
boolean acquired = lock.acquire(owner, lockTimeout, lockType);
- if (acquired)
- {
- // Record the lock for release on method return or tx commit/rollback
- if (gtx != null)
- {
- ctx.getTransactionEntry().addLock(lock);
- }
- else
- {
- ctx.addLock(lock);
- }
- }
+ // Record the lock for release on method return or tx commit/rollback
+ if (acquired) ctx.addLock(lock);
}
}