svn commit: r611386 - in /lucene/hadoop/branches/branch-0.15: CHANGES.txt src/java/org/apache/hadoop/dfs/FSNamesystem.java

[dhruba]

Author: dhruba
Date: Sat Jan 12 00:19:46 2008
New Revision: 611386

URL: http://svn.apache.org/viewvc?rev=611386&view=rev
Log:
HADOOP-2540. fsck reports missing blocks incorrectly. (dhruba)
svn merge -c 611385 from trunk.


Modified:
    lucene/hadoop/branches/branch-0.15/CHANGES.txt
    
lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/dfs/FSNamesystem.java

Modified: lucene/hadoop/branches/branch-0.15/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/CHANGES.txt?rev=611386&r1=611385&r2=611386&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.15/CHANGES.txt Sat Jan 12 00:19:46 2008
@@ -7,6 +7,8 @@
 
     HADOOP-2562. globPaths supports {ab,cd}.  (Hairong Kuang via dhruba)
 
+    HADOOP-2540. fsck reports missing blocks incorrectly. (dhruba)
+
 Release 0.15.2 - 2008-01-02
 
   BUG FIXES

Modified: 
lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/dfs/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/dfs/FSNamesystem.java?rev=611386&r1=611385&r2=611386&view=diff
==============================================================================
--- 
lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/dfs/FSNamesystem.java
 (original)
+++ 
lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/dfs/FSNamesystem.java
 Sat Jan 12 00:19:46 2008
@@ -1600,7 +1600,7 @@
     // will report this block as a missing block because no datanodes have it.
     // Delete this block.
     Block[] blocks = pendingFile.getBlocks();
-    if (blocks != null && blocks.length > 1) {
+    if (blocks != null && blocks.length > 0) {
       Block last = blocks[blocks.length - 1];
       if (last.getNumBytes() == 0) {
           pendingFile.removeBlock(last);