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 ar...@apache.org on 2017/01/10 22:50:57 UTC
[2/2] hadoop git commit: HDFS-11253. FileInputStream leak on failure
path in BlockSender. Contributed by Arpit Agarwal
HDFS-11253. FileInputStream leak on failure path in BlockSender. Contributed by Arpit Agarwal
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ce5ad0e8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ce5ad0e8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ce5ad0e8
Branch: refs/heads/branch-2
Commit: ce5ad0e88f463b22e975f2a480c0a54a56f80c1e
Parents: 48fb796
Author: Mingliang Liu <li...@apache.org>
Authored: Thu Dec 15 15:39:15 2016 -0800
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Tue Jan 10 14:48:28 2017 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce5ad0e8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
index 0c3c3dc..cf59e62 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
@@ -414,6 +414,8 @@ class BlockSender implements java.io.Closeable {
ris = new ReplicaInputStreams(blockIn, checksumIn, volumeRef);
} catch (IOException ioe) {
IOUtils.closeStream(this);
+ org.apache.commons.io.IOUtils.closeQuietly(blockIn);
+ org.apache.commons.io.IOUtils.closeQuietly(checksumIn);
throw ioe;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org