hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject [10/24] hadoop git commit: HADOOP-10689. InputStream is not closed in AzureNativeFileSystemStore#retrieve(). Contributed by Chen He.
Date Wed, 17 Dec 2014 22:59:56 GMT
HADOOP-10689. InputStream is not closed in AzureNativeFileSystemStore#retrieve(). Contributed
by Chen He.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604233 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 8300b9fb385b47672d98ea62ab291991424f3cce)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/80d005c6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/80d005c6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/80d005c6

Branch: refs/heads/branch-2
Commit: 80d005c66ff28d322f5d8edfb8857e480197ffaf
Parents: 82268d8
Author: Chris Nauroth <cnauroth@apache.org>
Authored: Fri Jun 20 18:30:49 2014 +0000
Committer: cnauroth <cnauroth@apache.org>
Committed: Wed Dec 17 14:57:12 2014 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                   | 3 +++
 .../org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/80d005c6/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 3e7b762..ff07174 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -229,6 +229,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11420. Use latest maven-site-plugin and replace link to svn with
     link to git. (Herve Boutemy via wheat9)
 
+    HADOOP-10689. InputStream is not closed in
+    AzureNativeFileSystemStore#retrieve(). (Chen He via cnauroth)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/80d005c6/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
index 9dcaddc..c5b9afe 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
@@ -1723,7 +1723,7 @@ class AzureNativeFileSystemStore implements NativeFileSystemStore {
           inDataStream.close();
         }
         if(in != null){
-          inDataStream.close();
+          in.close();
         }
         throw e;
       }


Mime
View raw message