Author: tolusha Date: 2011-01-19 03:16:34 -0500 (Wed, 19 Jan 2011) New Revision: 3819 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-1078: fix suspend MulitIndex 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-01-19 08:00:16 UTC (rev 3818) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-01-19 08:16:34 UTC (rev 3819) @@ -2582,8 +2582,20 @@ */ protected void suspend() throws IOException { - flush(); - merger.dispose(); + if (modeHandler.getMode() == IndexerIoMode.READ_WRITE) + { + try + { + indexUpdateMonitor.setUpdateInProgress(true, true); + flush(); + + merger.dispose(); + } + finally + { + indexUpdateMonitor.setUpdateInProgress(false, true); + } + } } /** @@ -2593,8 +2605,11 @@ */ protected void resume() throws IOException { - merger = doInitIndexMerger(); - merger.start(); + if (modeHandler.getMode() == IndexerIoMode.READ_WRITE) + { + merger = doInitIndexMerger(); + merger.start(); + } } /** 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-01-19 08:00:16 UTC (rev 3818) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-01-19 08:16:34 UTC (rev 3819) @@ -2815,17 +2815,14 @@ */ public void suspend() throws SuspendException { - if (modeHandler.getMode() == IndexerIoMode.READ_WRITE) + try { - try - { - index.suspend(); - } - catch (IOException e) - { - throw new SuspendException(e); - } + index.suspend(); } + catch (IOException e) + { + throw new SuspendException(e); + } } /** @@ -2833,16 +2830,13 @@ */ public void resume() throws ResumeException { - if (modeHandler.getMode() == IndexerIoMode.READ_WRITE) + try { - try - { - index.resume(); - } - catch (IOException e) - { - throw new ResumeException(e); - } + index.resume(); } + catch (IOException e) + { + throw new ResumeException(e); + } } }