mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Fix for ALF-19787 RED BUILD: Build repeatedly hanging in UsageTestSuite
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1604,20 +1604,18 @@ public class IndexInfo implements IndexMonitor
|
|||||||
{
|
{
|
||||||
synchronized (mergerTargetLock)
|
synchronized (mergerTargetLock)
|
||||||
{
|
{
|
||||||
if(shouldBlock())
|
if (s_logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
s_logger.debug("THROTTLING: " + Thread.currentThread().getName() + " " + indexEntries.size());
|
||||||
|
}
|
||||||
|
merger.schedule();
|
||||||
|
releaseWriteLock();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
mergerTargetLock.wait(60000);
|
||||||
|
}
|
||||||
|
catch (InterruptedException e)
|
||||||
{
|
{
|
||||||
if (s_logger.isDebugEnabled())
|
|
||||||
{
|
|
||||||
s_logger.debug("THROTTLING: " + Thread.currentThread().getName() + " " + indexEntries.size());
|
|
||||||
}
|
|
||||||
releaseWriteLock();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
mergerTargetLock.wait(60000);
|
|
||||||
}
|
|
||||||
catch (InterruptedException e)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
getWriteLock();
|
getWriteLock();
|
||||||
@@ -2576,10 +2574,7 @@ public class IndexInfo implements IndexMonitor
|
|||||||
{
|
{
|
||||||
synchronized (mergerTargetLock)
|
synchronized (mergerTargetLock)
|
||||||
{
|
{
|
||||||
if (!shouldBlock())
|
mergerTargetLock.notifyAll();
|
||||||
{
|
|
||||||
mergerTargetLock.notifyAll();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user