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 2012/01/29 13:39:26 UTC
svn commit: r1237264 -
/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiReader.java
Author: uschindler
Date: Sun Jan 29 12:39:26 2012
New Revision: 1237264
URL: http://svn.apache.org/viewvc?rev=1237264&view=rev
Log:
LUCENE-2858: Remove dead code in MultiReader, remove special decRef handling as MultiReaders will no longer support openIfChanged
Modified:
lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiReader.java
Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiReader.java?rev=1237264&r1=1237263&r2=1237264&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiReader.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/MultiReader.java Sun Jan 29 12:39:26 2012
@@ -22,7 +22,7 @@ import java.io.IOException;
/** An IndexReader which reads multiple indexes, appending
* their content. */
public class MultiReader extends BaseMultiReader<IndexReader> {
- private final boolean[] decrefOnClose; // remember which subreaders to decRef on close
+ private final boolean closeSubReaders;
/**
* <p>Construct a MultiReader aggregating the named set of (sub)readers.
@@ -41,33 +41,23 @@ public class MultiReader extends BaseMul
*/
public MultiReader(IndexReader[] subReaders, boolean closeSubReaders) throws IOException {
super(subReaders.clone());
- decrefOnClose = new boolean[subReaders.length];
- for (int i = 0; i < subReaders.length; i++) {
- if (!closeSubReaders) {
+ this.closeSubReaders = closeSubReaders;
+ if (!closeSubReaders) {
+ for (int i = 0; i < subReaders.length; i++) {
subReaders[i].incRef();
- decrefOnClose[i] = true;
- } else {
- decrefOnClose[i] = false;
}
}
}
-
- // used only by openIfChaged
- private MultiReader(IndexReader[] subReaders, boolean[] decrefOnClose)
- throws IOException {
- super(subReaders);
- this.decrefOnClose = decrefOnClose;
- }
@Override
protected synchronized void doClose() throws IOException {
IOException ioe = null;
for (int i = 0; i < subReaders.length; i++) {
try {
- if (decrefOnClose[i]) {
- subReaders[i].decRef();
- } else {
+ if (closeSubReaders) {
subReaders[i].close();
+ } else {
+ subReaders[i].decRef();
}
} catch (IOException e) {
if (ioe == null) ioe = e;