You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by oz...@apache.org on 2005/01/08 19:57:38 UTC
cvs commit: jakarta-commons/transaction/src/java/org/apache/commons/transaction/locking ReadWriteUpgradeLock.java
ozeigermann 2005/01/08 10:57:38
Modified: transaction/src/java/org/apache/commons/transaction/locking
ReadWriteUpgradeLock.java
Log:
Adapted to new GenericLockManager layout
Revision Changes Path
1.2 +10 -10 jakarta-commons/transaction/src/java/org/apache/commons/transaction/locking/ReadWriteUpgradeLock.java
Index: ReadWriteUpgradeLock.java
===================================================================
RCS file: /home/cvs/jakarta-commons/transaction/src/java/org/apache/commons/transaction/locking/ReadWriteUpgradeLock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReadWriteUpgradeLock.java 17 Dec 2004 00:30:54 -0000 1.1
+++ ReadWriteUpgradeLock.java 8 Jan 2005 18:57:38 -0000 1.2
@@ -140,14 +140,14 @@
}
/**
- * @see GenericLock#acquire(Object, int, boolean, boolean, long)
+ * @see GenericLock#acquire(Object, int, boolean, int, boolean, long)
*/
public synchronized boolean acquire(Object ownerId, int targetLockLevel, boolean wait,
- boolean reentrant, long timeoutMSecs) throws InterruptedException {
- boolean preferred = (targetLockLevel == WRITE_LOCK && getLockLevel(ownerId) == UPGRADE_LOCK);
-
- return acquire(ownerId, targetLockLevel, wait, reentrant ? COMPATIBILITY_REENTRANT
- : COMPATIBILITY_NONE, preferred, timeoutMSecs);
+ int compatibility, boolean preferred, long timeoutMSecs) throws InterruptedException {
+ if (targetLockLevel == WRITE_LOCK && getLockLevel(ownerId) == UPGRADE_LOCK) {
+ preferred = true;
+ }
+ return super.acquire(ownerId, targetLockLevel, wait, compatibility, preferred, timeoutMSecs);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org