[exo-jcr-commits] exo-jcr SVN: r5931 - in jcr/branches/1.14.x/patch: JCR-1722 and 1 other directory.

Author: nzamosenchuk Date: 2012-03-21 10:57:07 -0400 (Wed, 21 Mar 2012) New Revision: 5931 Added: jcr/branches/1.14.x/patch/JCR-1722/ jcr/branches/1.14.x/patch/JCR-1722/JCR-1722.patch Log: JCR-1722 : patch proposed Added: jcr/branches/1.14.x/patch/JCR-1722/JCR-1722.patch =================================================================== --- jcr/branches/1.14.x/patch/JCR-1722/JCR-1722.patch (rev 0) +++ jcr/branches/1.14.x/patch/JCR-1722/JCR-1722.patch 2012-03-21 14:57:07 UTC (rev 5931) @@ -0,0 +1,34 @@ +Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java +=================================================================== +--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java (revision 5928) ++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java (working copy) +@@ -3300,7 +3300,7 @@ + switch (mode) + { + case READ_ONLY : +- setReadOny(); ++ setReadOnly(); + break; + case READ_WRITE : + setReadWrite(); +@@ -3316,7 +3316,7 @@ + /** + * Sets mode to READ_ONLY, discarding flush task + */ +- protected void setReadOny() ++ protected void setReadOnly() + { + // try to stop merger in safe way + if (merger != null) +@@ -3325,7 +3325,10 @@ + merger = null; + } + +- flushTask.cancel(); ++ if (flushTask != null) ++ { ++ flushTask.cancel(); ++ } + FLUSH_TIMER.purge(); + this.redoLog = null; + }