From d689b2d99c7b4d7e587225638dd8f5af0a690dcc Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Fri, 19 Jan 2018 14:54:13 +0000
Subject: [PATCH] HADOOP-15114. Add closeStreams(...) to IOUtils (addendum).
 Contributed by Ajay Kumar.

---
 .../org/apache/hadoop/io/TestIOUtils.java     | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

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 2e46c623d9..467e5bc302 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 void testListDirectory() throws IOException {
   }
 
   @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 void close() throws IOException {
       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);
     }
 
   }