From 291af51b654e9de533e084042051ef6650b05fc2 Mon Sep 17 00:00:00 2001
From: Kihwal Lee <kihwal@apache.org>
Date: Mon, 21 Apr 2014 19:20:00 +0000
Subject: [PATCH] HADOOP-10526. Chance for Stream leakage in CompressorStream.
 Contributed by Rushabh Shah.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1588970 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hadoop-common/CHANGES.txt                 |  3 +
 .../hadoop/io/compress/CompressorStream.java  | 10 ++-
 .../io/compress/TestCompressorStream.java     | 75 +++++++++++++++++++
 3 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorStream.java

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 3d7752a41a7..9fa00f9f113 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -396,6 +396,9 @@ Release 2.5.0 - UNRELEASED
     HADOOP-9919. Update hadoop-metrics2.properties examples to Yarn.
     (Akira AJISAKA via suresh)
 
+    HADOOP-10526. Chance for Stream leakage in CompressorStream. (Rushabh 
+    Shah via kihwal)
+
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressorStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressorStream.java
index 84f1b2f179b..34426f84024 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressorStream.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressorStream.java
@@ -102,9 +102,13 @@ public class CompressorStream extends CompressionOutputStream {
   @Override
   public void close() throws IOException {
     if (!closed) {
-      finish();
-      out.close();
-      closed = true;
+      try {
+        finish();
+      }
+      finally {
+        out.close();
+        closed = true;
+      }
     }
   }
 
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorStream.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorStream.java
new file mode 100644
index 00000000000..c3f10bf13ca
--- /dev/null
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorStream.java
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.io.compress;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestCompressorStream extends CompressorStream{
+  
+  private static FileOutputStream fop = null;
+  private static File file = null;
+  
+  static {
+    try {
+      file = new File("tmp.txt");
+      fop = new FileOutputStream(file);
+      if (!file.exists()) {
+        file.createNewFile();
+      }
+    } catch (IOException e) {
+      System.out.println("Error while creating a new file " + e.getMessage());
+    }
+  }
+  
+  public TestCompressorStream() {
+    super(fop);
+  }
+  
+  /**
+   * Overriding {@link CompressorStream#finish()} method in order 
+   * to reproduce test case
+   */
+  public void finish() throws IOException {
+    throw new IOException();
+  }
+
+  /**
+   * In {@link CompressorStream#close()}, if 
+   * {@link CompressorStream#finish()} throws an IOEXception, outputStream 
+   * object was not getting closed.
+   */
+  @Test
+  public void  testClose() {
+    TestCompressorStream testCompressorStream = new TestCompressorStream();
+    try {
+      testCompressorStream.close(); 
+    }
+    catch(IOException e) {
+      System.out.println("Expected IOException");
+    }
+    Assert.assertTrue("closed shoud be true", 
+        ((CompressorStream)testCompressorStream).closed);
+    //cleanup after test case
+    file.delete();
+  }
+}