inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
73355: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73281: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73054 (REDO MERGE): Added LockDAO.releaseLockQuiet and used it for the callback's precautionary lock release
                - Fixes MNT-11507: JobLockService automatic refresh is triggering a retry under normal conditions
                - Prevents a DEBUG message from RetryingTransactionInterceptor when the normal condition is for
         	    the lock to no longer exist
         73279: Fix javadoc for JobLockService.releaseLock to include @throws
         This revision undoes the behaviour change of JobLockService.releaseLock introduced by:
           56164: Fixes ALF-19964: Breaking API change in JobLockService.releaseLock
         The JobLockService now behaves the same on 4.1.x and 4.2.x, while all bug fixes are preserved.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:59:34 +00:00
parent 0b5a6de25c
commit 133428c149
6 changed files with 23 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/lock/JobLockService.java
View File

@@ -169,27 +169,23 @@ public interface JobLockService
void refreshLock(String lockToken, QName lockQName, long timeToLive, JobLockRefreshCallback callback);
/**
* Release the lock using a valid lock token. The lock can have expired or even been taken
* by another processes (i.e. the lock token will no longer be valid); none of this will
* prevent the method from succeeding. This operation is functionally the same as the newer
* {@link #releaseLockVerify(String, QName)} operation, other than it returns void. Retained
* for backwards-compatibility.
* Release the lock using a valid lock token.
*
* @param lockToken the lock token returned when the lock was acquired
* @param lockQName the name of the previously-acquired lock
* @throws LockAcquisitionException if the lock has been taken over by another process
*/
void releaseLock(String lockToken, QName lockQName);
/**
* Release the lock using a valid lock token. The lock can have expired or even been taken
* by another processes (i.e. the lock token will no longer be valid); none of this will
* prevent the method from succeeding. Functionally similar to {@link #releaseLock(String, QName)}, but
* this newer operation indicates whether a lock was actually released by its return value.
* Release the lock using a valid lock token. The lock can have been taken
* by another process (i.e. the lock token will no longer be valid); none of this will
* prevent the method from succeeding.
*
* @param lockToken the lock token returned when the lock was acquired
* @param lockQName the name of the previously-acquired lock
* @return <tt>true</tt> if the lock was valid and released otherwise
* <tt>false</tt> if the lock was no longer valid in any case
* <tt>false</tt> if the lock was already held by another token
*/
boolean releaseLockVerify(String lockToken, QName lockQName);