You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/12/19 23:32:35 UTC

svn commit: r1646899 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java

Author: rmuir
Date: Fri Dec 19 22:32:35 2014
New Revision: 1646899

URL: http://svn.apache.org/r1646899
Log:
LUCENE-6124: fix double-close bug in BaseDirectoryWrapper

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/test-framework/   (props changed)
    lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java

Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java?rev=1646899&r1=1646898&r2=1646899&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java Fri Dec 19 22:32:35 2014
@@ -40,9 +40,11 @@ public class BaseDirectoryWrapper extend
 
   @Override
   public void close() throws IOException {
-    isOpen = false;
-    if (checkIndexOnClose && DirectoryReader.indexExists(this)) {
-      TestUtil.checkIndex(this, crossCheckTermVectorsOnClose);
+    if (isOpen) {
+      isOpen = false;
+      if (checkIndexOnClose && DirectoryReader.indexExists(this)) {
+        TestUtil.checkIndex(this, crossCheckTermVectorsOnClose);
+      }
     }
     super.close();
   }