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

12
source/test-java/org/alfresco/repo/domain/locks/LockDAOTest.java
View File

@@ -238,12 +238,12 @@ public class LockDAOTest extends TestCase
String token = lock(lockAAA, 500000L, true);
release(lockAAA, token, true);
token = lock(lockAAA, 0L, true);
// Check that the lock cannot be release when not held
release(lockAAA, "Invalid-Token", false);
assertFalse(lockDAO.releaseLockQuiet(lockAAA, "invalidToken"));
assertTrue(lockDAO.releaseLockQuiet(lockAAA, token));
assertFalse(lockDAO.releaseLockQuiet(lockAAA, token));
// Check that the lock cannot be release when not held
release(lockAAA, "Invalid-Token", false);
assertFalse(lockDAO.releaseLock(lockAAA, "invalidToken", true));
assertTrue(lockDAO.releaseLock(lockAAA, token, true));
assertFalse(lockDAO.releaseLock(lockAAA, token, true));
}
public void testReleaseLockRepeated() throws Exception