[exo-jcr-commits] exo-jcr SVN: r4179 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
Author: tolusha
Date: 2011-03-28 08:10:43 -0400 (Mon, 28 Mar 2011)
New Revision: 4179
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
Log:
EXOJCR-1170: start merger during 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-03-25
16:58:38 UTC (rev 4178)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-03-28
12:10:43 UTC (rev 4179)
@@ -1531,7 +1531,7 @@
/**
* Initialize IndexMerger.
*/
- private IndexMerger doInitIndexMerger() throws IOException
+ private void doInitIndexMerger() throws IOException
{
merger = new IndexMerger(this);
merger.setMaxMergeDocs(handler.getMaxMergeDocs());
@@ -1542,8 +1542,6 @@
{
merger.indexAdded(((PersistentIndex)index).getName(),
((PersistentIndex)index).getNumDocuments());
}
-
- return merger;
}
/**
@@ -3203,7 +3201,7 @@
attemptDelete();
// now that we are ready, start index merger
- merger = doInitIndexMerger();
+ doInitIndexMerger();
merger.start();
if (redoLogApplied)
@@ -3648,6 +3646,7 @@
refreshIndexList();
doInitIndexMerger();
+ merger.start();
}
catch (IOException e)
{