Repository: hadoop Updated Branches: refs/heads/branch-2.7 bcb98ba08 -> 6078172fe
HADOOP-10365. BufferedOutputStream in FileUtil#unpackEntries() should be closed in finally block. Contributed by Kiran Kumar M R and Sanghyun Yun. (cherry picked from commit dd149adeace8727864371c5a1484c6534f8b450b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6078172f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6078172f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6078172f Branch: refs/heads/branch-2.7 Commit: 6078172fee6b0843cf4aa0fce5090d728ab7e53a Parents: bcb98ba Author: Tsuyoshi Ozawa <[email protected]> Authored: Wed Sep 2 02:01:51 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Wed Sep 2 02:02:28 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/fs/FileUtil.java | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6078172f/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index cdc7b66..010ba3c 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -35,6 +35,9 @@ Release 2.7.2 - UNRELEASED HADOOP-12359. hadoop fs -getmerge doc is wrong. (Jagadesh Kiran N via aajisaka) + HADOOP-10365. BufferedOutputStream in FileUtil#unpackEntries() should be + closed in finally block. (Kiran Kumar M R and Sanghyun Yun via ozawa) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/6078172f/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java index 91f00e1..23fb946 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java @@ -729,15 +729,15 @@ public class FileUtil { int count; byte data[] = new byte[2048]; - BufferedOutputStream outputStream = new BufferedOutputStream( - new FileOutputStream(outputFile)); + try (BufferedOutputStream outputStream = new BufferedOutputStream( + new FileOutputStream(outputFile));) { - while ((count = tis.read(data)) != -1) { - outputStream.write(data, 0, count); - } + while ((count = tis.read(data)) != -1) { + outputStream.write(data, 0, count); + } - outputStream.flush(); - outputStream.close(); + outputStream.flush(); + } } /**
