Merge -r 536582:536583 from trunk to 0.13 branch. Fixes: HADOOP-1160.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.13@536587 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1,7 +1,7 @@
 Hadoop Change Log
 
 
-Trunk (unreleased changes)
+Branch 0.13 (unreleased changes)
 
  1. HADOOP-1047.  Fix TestReplication to succeed more reliably.
     (Hairong Kuang via cutting)
@@ -365,6 +365,10 @@ Trunk (unreleased changes)
 108. HADOOP-1255.  Fix a bug where the namenode falls into an infinite
      loop trying to remove a dead node.  (Hairong Kuang via cutting)
 
+109. HADOOP-1160.  Fix DistributedFileSystem.close() to close the
+     underlying FileSystem, correctly aborting files being written.
+     (Hairong Kuang via cutting)
+
 
 Release 0.12.3 - 2007-04-06
 

src/java/org/apache/hadoop/fs/FilterFileSystem.java

@@ -299,4 +299,10 @@ public class FilterFileSystem extends FileSystem {
   public Configuration getConf() {
     return fs.getConf();
   }
+  
+  @Override
+  public void close() throws IOException {
+    super.close();
+    fs.close();
+  }
 }