You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2018/01/19 14:54:37 UTC
hadoop git commit: HADOOP-15114. Add closeStreams(...) to IOUtils
(addendum). Contributed by Ajay Kumar.
Repository: hadoop
Updated Branches:
refs/heads/trunk e5a1ad6e2 -> d689b2d99
HADOOP-15114. Add closeStreams(...) to IOUtils (addendum).
Contributed by Ajay Kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d689b2d9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d689b2d9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d689b2d9
Branch: refs/heads/trunk
Commit: d689b2d99c7b4d7e587225638dd8f5af0a690dcc
Parents: e5a1ad6
Author: Steve Loughran <st...@apache.org>
Authored: Fri Jan 19 14:54:13 2018 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Jan 19 14:54:13 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/hadoop/io/TestIOUtils.java | 21 +++++++++-----------
1 file changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d689b2d9/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestIOUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestIOUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestIOUtils.java
index 2e46c62..467e5bc 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestIOUtils.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestIOUtils.java
@@ -299,13 +299,14 @@ public class TestIOUtils {
}
@Test
- public void testCloseStreams() {
- File tmpFile = new File("deleteMe.txt");
- FileOutputStream fos = null;
- BufferedOutputStream bos = null;
+ public void testCloseStreams() throws IOException {
+ File tmpFile = null;
+ FileOutputStream fos;
+ BufferedOutputStream bos;
FileOutputStream nullStream = null;
try {
+ tmpFile = new File(GenericTestUtils.getTestDir(), "testCloseStreams.txt");
fos = new FileOutputStream(tmpFile) {
@Override
public void close() throws IOException {
@@ -315,19 +316,15 @@ public class TestIOUtils {
bos = new BufferedOutputStream(
new FileOutputStream(tmpFile)) {
@Override
- public void close() throws IOException {
+ public void close() {
throw new NullPointerException();
}
};
- } catch (IOException ioe) {
- LOG.warn("Exception in TestIOUtils.testCloseStreams: ", ioe);
- }
- try {
+
IOUtils.closeStreams(fos, bos, nullStream);
IOUtils.closeStreams();
- } catch (Exception ex) {
- LOG.error("Expect IOUtils.closeStreams to close streams quietly.", ex);
- throw ex;
+ } finally {
+ FileUtils.deleteQuietly(tmpFile);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org