You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/12/10 10:48:52 UTC
svn commit: r1212754 - in /lucene/dev/branches/branch_3x/lucene: CHANGES.txt
src/java/org/apache/lucene/index/MultiReader.java
src/java/org/apache/lucene/index/ParallelReader.java
Author: uschindler
Date: Sat Dec 10 09:48:52 2011
New Revision: 1212754
URL: http://svn.apache.org/viewvc?rev=1212754&view=rev
Log:
LUCENE-3630: Fixed naming of the internal method MultiReader.doOpenIfChanged(boolean doClone) that was overriding IndexReader.doOpenIfChanged(boolean readOnly), so changing the contract of the overridden method
Modified:
lucene/dev/branches/branch_3x/lucene/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/MultiReader.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelReader.java
Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1212754&r1=1212753&r2=1212754&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Sat Dec 10 09:48:52 2011
@@ -57,6 +57,12 @@ Bug fixes
* LUCENE-3627: Don't let an errant 0-byte segments_N file corrupt the index.
(Ken McCracken via Mike McCandless)
+* LUCENE-3630: The internal method MultiReader.doOpenIfChanged(boolean doClone)
+ was overriding IndexReader.doOpenIfChanged(boolean readOnly), so changing the
+ contract of the overridden method. This method was renamed and made private.
+ In ParallelReader the bug was not existent, but the implementation method
+ was also made private. (Uwe Schindler)
+
Documentation
* LUCENE-3597: Fixed incorrect grouping documentation. (Martijn van Groningen, Robert Muir)
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/MultiReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/MultiReader.java?rev=1212754&r1=1212753&r2=1212754&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/MultiReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/MultiReader.java Sat Dec 10 09:48:52 2011
@@ -109,7 +109,7 @@ public class MultiReader extends IndexRe
*/
@Override
protected synchronized IndexReader doOpenIfChanged() throws CorruptIndexException, IOException {
- return doOpenIfChanged(false);
+ return doReopen(false);
}
/**
@@ -124,7 +124,7 @@ public class MultiReader extends IndexRe
@Override
public synchronized Object clone() {
try {
- return doOpenIfChanged(true);
+ return doReopen(true);
} catch (Exception ex) {
throw new RuntimeException(ex);
}
@@ -137,7 +137,7 @@ public class MultiReader extends IndexRe
* @throws CorruptIndexException
* @throws IOException
*/
- protected IndexReader doOpenIfChanged(boolean doClone) throws CorruptIndexException, IOException {
+ private IndexReader doReopen(boolean doClone) throws CorruptIndexException, IOException {
ensureOpen();
boolean changed = false;
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelReader.java?rev=1212754&r1=1212753&r2=1212754&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelReader.java Sat Dec 10 09:48:52 2011
@@ -174,7 +174,7 @@ public class ParallelReader extends Inde
return doReopen(false);
}
- protected IndexReader doReopen(boolean doClone) throws CorruptIndexException, IOException {
+ private IndexReader doReopen(boolean doClone) throws CorruptIndexException, IOException {
ensureOpen();
boolean reopened = false;