Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 dd149adeac)
This commit is contained in:
Tsuyoshi Ozawa 2015-09-02 02:01:51 +09:00
parent 236c4ab511
commit b1499ab0fe
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -626,6 +626,9 @@ Release 2.7.2 - UNRELEASED
HADOOP-12359. hadoop fs -getmerge doc is wrong. HADOOP-12359. hadoop fs -getmerge doc is wrong.
(Jagadesh Kiran N via aajisaka) (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 Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
View File

@ -738,15 +738,15 @@ public class FileUtil {
int count; int count;
byte data[] = new byte[2048]; byte data[] = new byte[2048];
BufferedOutputStream outputStream = new BufferedOutputStream( try (BufferedOutputStream outputStream = new BufferedOutputStream(
new FileOutputStream(outputFile)); new FileOutputStream(outputFile));) {
while ((count = tis.read(data)) != -1) { while ((count = tis.read(data)) != -1) {
outputStream.write(data, 0, count); outputStream.write(data, 0, count);
} }
outputStream.flush(); outputStream.flush();
outputStream.close(); }
} }
/** /**