LUCENE-1639: fix case where doc stores are incorrectly double opened, thus leaving open file handles after IndexWriter is closed

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@786545 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/lucene/index/IndexWriter.java

@@ -4829,7 +4829,7 @@ public class IndexWriter {
         }
 
         for(int i=0;i<numSegments;i++) {
-          merge.readersClone[i].openDocStores();
+          merge.readersClone[i].openDocStores(merge.readers[i]);
         }
 
         // Clear DSS

src/java/org/apache/lucene/index/MergePolicy.java

@@ -133,6 +133,9 @@ public abstract class MergePolicy {
         b.append(" into ").append(info.name);
       if (optimize)
         b.append(" [optimize]");
+      if (mergeDocStores) {
+        b.append(" [mergeDocStores]");
+      }
       return b.toString();
     }
   }

src/java/org/apache/lucene/index/SegmentReader.java

@@ -475,6 +475,17 @@ class SegmentReader extends IndexReader implements Cloneable {
     return instance;
   }
 
+  synchronized void openDocStores(SegmentReader orig) throws IOException {
+    if (fieldsReaderOrig == null) {
+      orig.openDocStores();
+      
+      fieldsReaderOrig = orig.fieldsReaderOrig;
+      termVectorsReaderOrig = orig.termVectorsReaderOrig;
+      storeCFSReader = orig.storeCFSReader;
+      cfsReader = orig.cfsReader;
+    }
+  }
+
   synchronized void openDocStores() throws IOException {
     if (fieldsReaderOrig == null) {
       final Directory storeDir;