You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2015/07/24 15:33:21 UTC
svn commit: r1692512 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java
Author: jpountz
Date: Fri Jul 24 13:33:20 2015
New Revision: 1692512
URL: http://svn.apache.org/r1692512
Log:
LUCENE-6696: Fix FilterDirectoryReader.doClose to call in.close() instead of in.doClose().
Added:
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java
- copied unchanged from r1692505, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1692512&r1=1692511&r2=1692512&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Fri Jul 24 13:33:20 2015
@@ -233,6 +233,9 @@ Bug fixes
but instead throw an exception from setMaxTokenLength() when the given
length is greater than 1M chars. (Piotr Idzikowski, Steve Rowe)
+* LUCENE-6696: Fix FilterDirectoryReader.close() to never close the
+ underlying reader several times. (Adrien Grand)
+
Changes in Runtime Behavior
* LUCENE-6501: The subreader structure in ParallelCompositeReader
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java?rev=1692512&r1=1692511&r2=1692512&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java Fri Jul 24 13:33:20 2015
@@ -131,7 +131,7 @@ public abstract class FilterDirectoryRea
@Override
protected void doClose() throws IOException {
- in.doClose();
+ in.close();
}
/** Returns the wrapped {@link DirectoryReader}. */