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

73348: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73162: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73054: 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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:58:39 +00:00
parent d7695471f8
commit 73d5ddfb3d
4 changed files with 66 additions and 9 deletions

View File

@@ -238,6 +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));
}
public void testReleaseLockRepeated() throws Exception