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

[dhruba]

Author: dhruba
Date: Mon Oct  1 15:37:04 2007
New Revision: 581106

URL: http://svn.apache.org/viewvc?rev=581106&view=rev
Log:
HADOOP-1948. Removed spurious error message during block crc upgrade.
svn merge -c 581094, sv merge -c 581101 from trunk.
(Raghu Angadi via dhruba)


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

Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?rev=581106&r1=581105&r2=581106&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Mon Oct  1 15:37:04 2007
@@ -8,6 +8,8 @@
     HADOOP-1783.  Make S3 FileSystem return Paths fully-qualified with
     scheme and host.  (tomwhite)
 
+    HADOOP-1948. Removed spurious error message during block crc upgrade.
+    (Raghu Angadi via dhruba)
 
 Release 0.14.1 - 2007-09-04
 

Modified: 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/dfs/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/dfs/FSNamesystem.java?rev=581106&r1=581105&r2=581106&view=diff
==============================================================================
--- 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/dfs/FSNamesystem.java
 (original)
+++ 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/dfs/FSNamesystem.java
 Mon Oct  1 15:37:04 2007
@@ -470,7 +470,7 @@
       }
     }
 
-    if ( crcInfo.blockLen <= 0 ) {
+    if ( crcInfo.blockLen < 0 ) {
       LOG.warn("blockCrcInfo(): " + block + 
                " could not be found in blocks for " + crcInfo.fileName);
       return crcInfo;