Author: suresh
Date: Wed Feb 12 18:05:15 2014
New Revision: 1567705
URL: http://svn.apache.org/r1567705
Log:
HDFS-5879. Merge 1567704 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestHftpFileSystem.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1567705&r1=1567704&r2=1567705&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Feb 12 18:05:15 2014
@@ -78,6 +78,9 @@ Release 2.4.0 - UNRELEASED
HDFS-4858. HDFS DataNode to NameNode RPC should timeout.
(Henry Wang via shv)
+ HDFS-5879. Some TestHftpFileSystem tests do not close streams.
+ (Gera Shegalov via suresh)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestHftpFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestHftpFileSystem.java?rev=1567705&r1=1567704&r2=1567705&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestHftpFileSystem.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestHftpFileSystem.java
Wed Feb 12 18:05:15 2014
@@ -136,6 +136,7 @@ public class TestHftpFileSystem {
out.close();
FSDataInputStream in = hftpFs.open(p);
assertEquals('0', in.read());
+ in.close();
// Check the file status matches the path. Hftp returns a FileStatus
// with the entire URI, extract the path part.
@@ -250,6 +251,7 @@ public class TestHftpFileSystem {
FSDataInputStream in = hftpFs.open(testFile);
in.seek(7);
assertEquals('7', in.read());
+ in.close();
}
@Test
