HBASE-22611 Close the DataOutputStream object #325

apache · Jun 24, 2019 · 841b319 · 841b319
1 parent 10032a1
commit 841b319
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexCodecV1.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexCodecV1.java
@@ -118,16 +118,17 @@ public ByteBuffer decodeKeyValues(DataInputStream source,
       }
       boolean includesMvcc = decodingCtx.getHFileContext().isIncludesMvcc();
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      DataOutputStream out = new DataOutputStream(baos);
-      for (Cell cell : kvs) {
-        KeyValue currentCell = KeyValueUtil.copyToNewKeyValue(cell);
-        out.write(currentCell.getBuffer(), currentCell.getOffset(),
-            currentCell.getLength());
-        if (includesMvcc) {
-          WritableUtils.writeVLong(out, cell.getSequenceId());
+      try (DataOutputStream out = new DataOutputStream(baos)) {
+        for (Cell cell : kvs) {
+          KeyValue currentCell = KeyValueUtil.copyToNewKeyValue(cell);
+          out.write(currentCell.getBuffer(), currentCell.getOffset(),
+                  currentCell.getLength());
+          if (includesMvcc) {
+            WritableUtils.writeVLong(out, cell.getSequenceId());
+          }
         }
+        out.flush();
       }
-      out.flush();
       return ByteBuffer.wrap(baos.getBuffer(), 0, baos.size());
     }
   }