Author: cutting Date: Wed May 9 10:07:11 2007 New Revision: 536587 URL: http://svn.apache.org/viewvc?view=rev&rev=536587 Log: Merge -r 536582:536583 from trunk to 0.13 branch. Fixes: HADOOP-1160.
Modified: lucene/hadoop/branches/branch-0.13/CHANGES.txt lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FilterFileSystem.java Modified: lucene/hadoop/branches/branch-0.13/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/CHANGES.txt?view=diff&rev=536587&r1=536586&r2=536587 ============================================================================== --- lucene/hadoop/branches/branch-0.13/CHANGES.txt (original) +++ lucene/hadoop/branches/branch-0.13/CHANGES.txt Wed May 9 10:07:11 2007 @@ -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) @@ -364,6 +364,10 @@ 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 Modified: lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FilterFileSystem.java URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FilterFileSystem.java?view=diff&rev=536587&r1=536586&r2=536587 ============================================================================== --- lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FilterFileSystem.java (original) +++ lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FilterFileSystem.java Wed May 9 10:07:11 2007 @@ -299,4 +299,10 @@ public Configuration getConf() { return fs.getConf(); } + + @Override + public void close() throws IOException { + super.close(); + fs.close(); + } }