Author: ozeigermann
Date: Thu Jul 13 10:48:24 2006
New Revision: 421671

URL: http://svn.apache.org/viewvc?rev=421671&view=rev
Log:
All lock methods now pass time out to underlying implementation.
Bug reported by Mathieu Baudier!

Modified:
    
jakarta/commons/proper/transaction/trunk/src/java/org/apache/commons/transaction/locking/GenericLockManager.java

Modified: 
jakarta/commons/proper/transaction/trunk/src/java/org/apache/commons/transaction/locking/GenericLockManager.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/src/java/org/apache/commons/transaction/locking/GenericLockManager.java?rev=421671&r1=421670&r2=421671&view=diff
==============================================================================
--- 
jakarta/commons/proper/transaction/trunk/src/java/org/apache/commons/transaction/locking/GenericLockManager.java
 (original)
+++ 
jakarta/commons/proper/transaction/trunk/src/java/org/apache/commons/transaction/locking/GenericLockManager.java
 Thu Jul 13 10:48:24 2006
@@ -181,7 +181,7 @@
     public void lock(Object ownerId, Object resourceId, int targetLockLevel, 
boolean reentrant,
             long timeoutMSecs) throws LockException {
         lock(ownerId, resourceId, targetLockLevel, reentrant ? 
GenericLock.COMPATIBILITY_REENTRANT
-                : GenericLock.COMPATIBILITY_NONE, false, globalTimeoutMSecs);
+                : GenericLock.COMPATIBILITY_NONE, false, timeoutMSecs);
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to