From 9d0fd59c48487965f75d7abc9403f90f531d6c4a Mon Sep 17 00:00:00 2001
From: Andrew Hind <andy.hind@alfresco.com>
Date: Mon, 2 Sep 2013 19:40:53 +0000
Subject: [PATCH] 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
---
 .../search/impl/lucene/index/IndexInfo.java   | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

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();   
             }            
         }
     }