Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)

115548 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112342 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
         112260: MNT-14526 : JobLockService add getLock with refresh callback variant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-10-30 00:16:08 +00:00
parent d505abcf14
commit 3434a81b7d
3 changed files with 170 additions and 4 deletions

View File

@@ -222,7 +222,7 @@ public class JobLockServiceImpl implements JobLockService
// Done
return lockToken;
}
/**
* {@inheritDoc}
*
@@ -269,6 +269,28 @@ public class JobLockServiceImpl implements JobLockService
}
}
/**
* {@inheritDoc}
*/
@Override
public String getLock(QName lockQName, long timeToLive, JobLockRefreshCallback callback)
{
if (lockQName == null) throw new IllegalArgumentException("lock name null");
if (callback == null) throw new IllegalArgumentException("callback null");
String lockToken = getLock(lockQName, timeToLive);
try
{
refreshLock(lockToken, lockQName, timeToLive, callback);
return lockToken;
}
catch (IllegalArgumentException|LockAcquisitionException e)
{
this.releaseLockVerify(lockToken, lockQName);
throw e;
}
}
/**
* {@inheritDoc}
*/