make sure we close all in/output in the case of an error

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/docvalues@1129640 13f79535-47bb-0310-9956-ffa450edef68

lucene/src/java/org/apache/lucene/index/values/Bytes.java

@@ -35,6 +35,7 @@ import org.apache.lucene.util.AttributeSource;
 import org.apache.lucene.util.ByteBlockPool;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CodecUtil;
+import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.PagedBytes;
 
 /**
@@ -355,8 +356,9 @@ public final class Bytes {
       this.pool = pool;
       datOut = dir.createOutput(IndexFileNames.segmentFileName(id, "",
             DATA_EXTENSION));
+      boolean success = false;
+      try {
         CodecUtil.writeHeader(datOut, codecName, version);
-
         if (initIndex) {
           idxOut = dir.createOutput(IndexFileNames.segmentFileName(id, "",
               INDEX_EXTENSION));
@@ -364,6 +366,12 @@ public final class Bytes {
         } else {
           idxOut = null;
         }
+        success = true;
+      } finally {
+        if (!success) {
+          IOUtils.closeSafely(true, datOut, idxOut);
+        }
+      }
     }
 
     /**
@@ -376,13 +384,9 @@ public final class Bytes {
     @Override
     public void finish(int docCount) throws IOException {
       try {
-          datOut.close();
+        IOUtils.closeSafely(false, datOut, idxOut);
       } finally {
-        try {
+        if (pool != null) {
-          if (idxOut != null)
-            idxOut.close();
-        } finally {
-          if (pool != null)
           pool.reset();
         }
       }

lucene/src/java/org/apache/lucene/index/values/Floats.java

@@ -29,6 +29,7 @@ import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.AttributeSource;
 import org.apache.lucene.util.CodecUtil;
 import org.apache.lucene.util.FloatsRef;
+import org.apache.lucene.util.IOUtils;
 
 /**
  * Exposes {@link Writer} and reader ({@link Source}) for 32 bit and 64 bit
@@ -82,9 +83,17 @@ public class Floats {
       this.precision = (byte) precision;
       datOut = dir.createOutput(IndexFileNames.segmentFileName(id, "",
           Writer.DATA_EXTENSION));
+      boolean success = false;
+      try {
         CodecUtil.writeHeader(datOut, CODEC_NAME, VERSION_CURRENT);
         assert datOut.getFilePointer() == CodecUtil.headerLength(CODEC_NAME);
         datOut.writeByte(this.precision);
+        success = true;
+      } finally {
+        if (!success) {
+          IOUtils.closeSafely(true, datOut);
+        }
+      }
     }
 
 

lucene/src/java/org/apache/lucene/index/values/PackedIntsImpl.java

@@ -27,6 +27,7 @@ import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.AttributeSource;
 import org.apache.lucene.util.CodecUtil;
+import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.LongsRef;
 import org.apache.lucene.util.OpenBitSet;
 import org.apache.lucene.util.RamUsageEstimator;
@@ -62,11 +63,21 @@ class PackedIntsImpl {
       super(bytesUsed);
       datOut = dir.createOutput(IndexFileNames.segmentFileName(id, "",
           DATA_EXTENSION));
+      boolean success = false;
+      try {
         CodecUtil.writeHeader(datOut, CODEC_NAME, VERSION_CURRENT);
         this.id = id;
         docToValue = new long[1];
-      bytesUsed.addAndGet(RamUsageEstimator.NUM_BYTES_LONG); // TODO the bitset
+        bytesUsed.addAndGet(RamUsageEstimator.NUM_BYTES_LONG); // TODO the
-                                                             // needs memory too
+                                                               // bitset
+                                                               // needs memory
+                                                               // too
+        success = true;
+      } finally {
+        if (!success) {
+          datOut.close();
+        }
+      }
     }
 
     @Override
@@ -168,7 +179,15 @@ class PackedIntsImpl {
     protected IntsReader(Directory dir, String id) throws IOException {
       datIn = dir.openInput(IndexFileNames.segmentFileName(id, "",
           Writer.DATA_EXTENSION));
+      boolean success = false;
+      try {
         CodecUtil.checkHeader(datIn, CODEC_NAME, VERSION_START, VERSION_START);
+        success = true;
+      } finally {
+        if (!success) {
+          IOUtils.closeSafely(true, datIn);
+        }
+      }
     }
 
     /**