[exo-jcr-commits] exo-jcr SVN: r5975 - jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1725.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2012-03-28 03:47:42 -0400 (Wed, 28 Mar 2012)
New Revision: 5975

Modified:
   jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1725/JCR-1725.patch
Log:
JCR-1725: patch updated

Modified: jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1725/JCR-1725.patch
===================================================================
--- jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1725/JCR-1725.patch	2012-03-28 07:43:43 UTC (rev 5974)
+++ jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1725/JCR-1725.patch	2012-03-28 07:47:42 UTC (rev 5975)
@@ -476,19 +476,20 @@
                          {
                             parentSearchManager.suspend();
                          }
-@@ -698,6 +699,11 @@
- 
+@@ -699,6 +700,12 @@
     public void stop()
     {
+       handler.close();
++
 +      if (handler instanceof SearchIndex)
 +      {
 +         ((SearchIndex)handler).resumeWaitingThreads();
 +      }
 +      
-       handler.close();
        // ChangesFiler instance is one for both SearchManagers and close() must be invoked only once,  
        if (parentSearchManager != null)
-@@ -1202,7 +1208,7 @@
+       {
+@@ -1202,7 +1209,7 @@
     {
        if (rpcService != null)
        {
@@ -497,7 +498,7 @@
  
           try
           {
-@@ -1228,7 +1234,7 @@
+@@ -1228,7 +1235,7 @@
      */
     public boolean isSuspended()
     {
@@ -506,7 +507,7 @@
     }
  
     /**
-@@ -1275,7 +1281,7 @@
+@@ -1275,7 +1282,7 @@
              throw new ResumeException(e);
           }
  
@@ -515,7 +516,7 @@
        }
        else
        {
-@@ -1303,10 +1309,10 @@
+@@ -1303,10 +1310,10 @@
           throw new IllegalStateException(
              "Index is not in READ_WRITE mode and reindexing can't be launched. Please start reindexing on coordinator node.");
        }
@@ -528,7 +529,7 @@
        }
  
        log.info("Starting hot reindexing on the " + handler.getContext().getRepositoryName() + "/"
-@@ -1321,7 +1327,7 @@
+@@ -1321,7 +1328,7 @@
              hotReindexingState = "Running. Started at " + sdf.format(Calendar.getInstance().getTime());
              try
              {
@@ -537,7 +538,7 @@
                 // set offline cluster wide (will make merger disposed and volatile flushed)
                 if (rpcService != null && changesFilter.isShared())
                 {
-@@ -1399,7 +1405,7 @@
+@@ -1399,7 +1406,7 @@
                    hotReindexingState = "Stopped with errors at " + sdf.format(Calendar.getInstance().getTime());
                    log.info("Reindexing halted with errors.");
                 }
@@ -546,7 +547,7 @@
              }
           }
        }, "HotReindexing-" + handler.getContext().getRepositoryName() + "-"
-@@ -1512,7 +1518,7 @@
+@@ -1512,7 +1519,7 @@
  
           public Serializable execute(Serializable[] args) throws Throwable
           {
@@ -555,7 +556,7 @@
           }
        });
  
-@@ -1542,27 +1548,27 @@
+@@ -1542,27 +1549,27 @@
           throw new SuspendException("Can't suspend index, while reindexing in progeress.");
        }
  
@@ -591,7 +592,7 @@
        }
     }
  
-@@ -1571,7 +1577,7 @@
+@@ -1571,7 +1578,7 @@
      */
     public void onChange(TopologyChangeEvent event)
     {