svn commit: r1212755 - in /lucene/dev/trunk: ./ lucene/ lucene/CHANGES.txt lucene/src/java/org/apache/lucene/index/MultiReader.java lucene/src/java/org/apache/lucene/index/ParallelReader.java

[us...@apache.org]

Author: uschindler
Date: Sat Dec 10 09:51:42 2011
New Revision: 1212755

URL: http://svn.apache.org/viewvc?rev=1212755&view=rev
Log:
Merged revision(s) 1212754 from lucene/dev/branches/branch_3x:
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/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelReader.java

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1212755&r1=1212754&r2=1212755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Sat Dec 10 09:51:42 2011
@@ -711,6 +711,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/trunk/lucene/src/java/org/apache/lucene/index/MultiReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiReader.java?rev=1212755&r1=1212754&r2=1212755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiReader.java Sat Dec 10 09:51:42 2011
@@ -108,7 +108,7 @@ public class MultiReader extends IndexRe
    */
   @Override
   protected synchronized IndexReader doOpenIfChanged() throws CorruptIndexException, IOException {
-    return doOpenIfChanged(false);
+    return doReopen(false);
   }
   
   /**
@@ -123,7 +123,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);
     }
@@ -141,7 +141,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/trunk/lucene/src/java/org/apache/lucene/index/ParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelReader.java?rev=1212755&r1=1212754&r2=1212755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelReader.java Sat Dec 10 09:51:42 2011
@@ -247,7 +247,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;