Merged DEV to HEAD

32207: Fix ALF-11644: AVM cleanup jobs run when WCM is not installed
          - Moved scheduled jobs to installable wcm-bootstrap-context.xml
          - Also got rid of orphan reaper warnings when running in a cluster (not ALF-11720, but mentioned in it)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-11-27 20:09:57 +00:00
parent c4c2ea52e9
commit ec242b6090
2 changed files with 3 additions and 58 deletions

View File

@@ -288,7 +288,7 @@ public class OrphanReaper
String lockToken = getLock(20000L);
if (lockToken == null)
{
fgLogger.warn("Can't get lock. Assume multiple reapers ...");
fgLogger.info("Can't get lock. Assume multiple reapers ...");
fActive = false;
return null;
}
@@ -437,6 +437,8 @@ public class OrphanReaper
reapCnt++;
}
jobLockService.releaseLock(lockToken, LOCK);
if (fgLogger.isDebugEnabled())
{
fgLogger.debug("Reaped "+reapCnt+" nodes in "+(System.currentTimeMillis()-start)+" msecs");