From 80d005c66ff28d322f5d8edfb8857e480197ffaf Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Fri, 20 Jun 2014 18:30:49 +0000 Subject: [PATCH] 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 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 3e7b7620770..ff07174d1a2 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 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 9dcaddc2315..c5b9afe6d80 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; }