svn commit: r1237492 - in /lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index: DirectoryReader.java FilterIndexReader.java

[us...@apache.org]

Author: uschindler
Date: Sun Jan 29 21:49:06 2012
New Revision: 1237492

URL: http://svn.apache.org/viewvc?rev=1237492&view=rev
Log:
LUCENE-2858: Fix NRT reopen (the logic is still horrible, but thats what current trunk does!)

Modified:
    lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java

Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DirectoryReader.java?rev=1237492&r1=1237491&r2=1237492&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DirectoryReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/DirectoryReader.java Sun Jan 29 21:49:06 2012
@@ -441,8 +441,7 @@ public final class DirectoryReader exten
     if (writer == this.writer && applyAllDeletes == this.applyAllDeletes) {
       return doOpenFromWriter(null);
     } else {
-      // fail by calling supers impl throwing UOE
-      throw new UnsupportedOperationException("This reader cannot be reopened from the given IndexWriter, as they don't match.");
+      return writer.getReader(applyAllDeletes);
     }
   }
 

Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java?rev=1237492&r1=1237491&r2=1237492&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java Sun Jan 29 21:49:06 2012
@@ -17,12 +17,10 @@ package org.apache.lucene.index;
  * limitations under the License.
  */
 
-import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 
 import java.io.IOException;
-import java.util.Map;
 import java.util.Comparator;
 
 /**  A <code>FilterIndexReader</code> contains another IndexReader, which it
@@ -33,11 +31,6 @@ import java.util.Comparator;
  * contained index reader. Subclasses of <code>FilterIndexReader</code> may
  * further override some of these methods and may also provide additional
  * methods and fields.
- * <p><b>Note:</b> The default implementation of {@link FilterIndexReader#doOpenIfChanged}
- * throws {@link UnsupportedOperationException} (like the base class),
- * so it's not possible to reopen a <code>FilterIndexReader</code>.
- * To reopen, you have to first reopen the underlying reader
- * and wrap it again with the custom filter.
  */
 public class FilterIndexReader extends AtomicIndexReader {
 
@@ -376,7 +369,7 @@ public class FilterIndexReader extends A
 
   @Override
   public String toString() {
-    final StringBuilder buffer = new StringBuilder("FilterReader(");
+    final StringBuilder buffer = new StringBuilder("FilterIndexReader(");
     buffer.append(in);
     buffer.append(')');
     return buffer.toString();