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

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

View File

@@ -30,7 +30,7 @@ import org.alfresco.service.namespace.QName;
public interface LockDAO
{
/**
* Aquire a given exclusive lock, assigning it (and any implicitly shared locks) a
* Acquire a given exclusive lock, assigning it (and any implicitly shared locks) a
* timeout. All shared locks are implicitly taken as well.
* <p>
* A lock can be re-taken if it has expired and if the lock token has not changed
@@ -78,15 +78,4 @@ public interface LockDAO
* and pessimistic release is requested.
*/
boolean releaseLock(QName lockQName, String lockToken, boolean optimistic);
/**
* Release a lock without throwing any exceptions if the lock was not updated.
*
* @param lockQName the unique name of the lock to release
* @param lockToken the current lock token
* @return Returns <tt>true</tt> if all the required locks were
* (still) held under the lock token and were
* valid at the time of release, otherwise <tt>false</tt>
*/
boolean releaseLockQuiet(QName lockQName, String lockToken);
}