Author: shv
Date: Fri Jan 16 13:22:19 2009
New Revision: 735143
URL: http://svn.apache.org/viewvc?rev=735143&view=rev
Log:
HADOOP-4965. Merge -r 735139:735140 from trunk to branch 0.20.
Modified:
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestFileAppend3.java
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=735143&r1=735142&r2=735143&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Fri Jan 16 13:22:19 2009
@@ -595,6 +595,8 @@
HADOOP-4918. Fix bzip2 compression to work with Sequence Files.
(Zheng Shao via dhruba).
+ HADOOP-4965. TestFileAppend3 should close FileSystem. (shv)
+
Release 0.19.0 - 2008-11-18
INCOMPATIBLE CHANGES
Modified:
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestFileAppend3.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestFileAppend3.java?rev=735143&r1=735142&r2=735143&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestFileAppend3.java
(original)
+++
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestFileAppend3.java
Fri Jan 16 13:22:19 2009
@@ -59,7 +59,8 @@
protected void tearDown() throws Exception {
AppendTestUtil.LOG.info("tearDown()");
- cluster.shutdown();
+ if(fs != null) fs.close();
+ if(cluster != null) cluster.shutdown();
}
};
}