[exo-jcr-commits] exo-jcr SVN: r4206 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2011-04-05 04:27:45 -0400 (Tue, 05 Apr 2011)
New Revision: 4206

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
Log:
EXOJCR-1275 : closing MultiIndex on suspend, initializing on resume.

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java	2011-04-04 11:59:02 UTC (rev 4205)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java	2011-04-05 08:27:45 UTC (rev 4206)
@@ -99,7 +99,7 @@
  * thread and reader threads is done using {@link #updateMonitor} and
  * {@link #updateInProgress}.
  */
-public class MultiIndex implements IndexerIoModeListener, IndexUpdateMonitorListener, Suspendable
+public class MultiIndex implements IndexerIoModeListener, IndexUpdateMonitorListener
 {
 
    /**
@@ -3652,40 +3652,4 @@
       }
       return true;
    }
-
-   /**
-    * {@inheritDoc}
-    */
-   public void suspend() throws SuspendException
-   {
-      try
-      {
-         releaseMultiReader();
-         flush();
-      }
-      catch (IOException e)
-      {
-         throw new SuspendException(e);
-      }
-      merger.dispose();
-   }
-
-   /**
-    * {@inheritDoc}
-    */
-   public void resume() throws ResumeException
-   {
-      try
-      {
-         indexNames.read();
-         refreshIndexList();
-
-         doInitIndexMerger();
-         merger.start();
-      }
-      catch (IOException e)
-      {
-         throw new ResumeException(e);
-      }
-   }
 }
\ No newline at end of file

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java	2011-04-04 11:59:02 UTC (rev 4205)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java	2011-04-05 08:27:45 UTC (rev 4206)
@@ -3052,12 +3052,7 @@
     */
    public void suspend() throws SuspendException
    {
-      errorLog.close();
-
-      if (index instanceof Suspendable)
-      {
-         ((Suspendable)index).suspend();
-      }
+      close();
    }
 
    /**
@@ -3067,16 +3062,16 @@
    {
       try
       {
-         doInitErrorLog();
+         closed = false;
+         doInit();
       }
       catch (IOException e)
       {
          throw new ResumeException(e);
       }
-
-      if (index instanceof Suspendable)
+      catch (RepositoryException e)
       {
-         ((Suspendable)index).resume();
+         throw new ResumeException(e);
       }
    }
 }