diff --git a/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java b/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java index 2af17a0a14..4a3bde4de4 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java @@ -1604,20 +1604,18 @@ public class IndexInfo implements IndexMonitor { 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(); @@ -2576,10 +2574,7 @@ public class IndexInfo implements IndexMonitor { synchronized (mergerTargetLock) { - if (!shouldBlock()) - { - mergerTargetLock.notifyAll(); - } + mergerTargetLock.notifyAll(); } } }