svn commit: r627946 - in /hadoop/core/branches/branch-0.16: CHANGES.txt src/java/org/apache/hadoop/dfs/DataNode.java

[dhruba]

Author: dhruba
Date: Thu Feb 14 20:48:15 2008
New Revision: 627946

URL: http://svn.apache.org/viewvc?rev=627946&view=rev
Log:
HADOOP-2814. Fix for NPE in datanode in unit test TestDataTransferProtocol.
(Raghu Angadi via dhruba)
svn merge -c 627944 from trunk.


Modified:
    hadoop/core/branches/branch-0.16/CHANGES.txt
    
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/dfs/DataNode.java

Modified: hadoop/core/branches/branch-0.16/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.16/CHANGES.txt?rev=627946&r1=627945&r2=627946&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.16/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.16/CHANGES.txt Thu Feb 14 20:48:15 2008
@@ -41,8 +41,11 @@
     HADOOP-2808. Minor fix to FileUtil::copy to mind the overwrite
     formal. (cdouglas)
 
-               HADOOP-2683. Moving UGI out of the RPC Server.
-               (Tsz Wo (Nicholas), SZE via shv)
+    HADOOP-2683. Moving UGI out of the RPC Server.
+    (Tsz Wo (Nicholas), SZE via shv)
+
+    HADOOP-2814. Fix for NPE in datanode in unit test TestDataTransferProtocol.
+    (Raghu Angadi via dhruba)
 
 Release 0.16.0 - 2008-02-07
 

Modified: 
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/dfs/DataNode.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/dfs/DataNode.java?rev=627946&r1=627945&r2=627946&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/dfs/DataNode.java 
(original)
+++ 
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/dfs/DataNode.java 
Thu Feb 14 20:48:15 2008
@@ -1968,15 +1968,15 @@
         this.block = block;
         this.in = in;
         this.inAddr = inAddr;
-        this.checksum = DataChecksum.newDataChecksum(in);
-        this.bytesPerChecksum = checksum.getBytesPerChecksum();
-        this.checksumSize = checksum.getChecksumSize();
-        this.buf = new byte[bytesPerChecksum + checksumSize];
         this.isRecovery = isRecovery;
         this.clientName = clientName;
         this.offsetInBlock = 0;
         this.currentWriteLock = new Object();
         this.currentWrite = false;
+        this.checksum = DataChecksum.newDataChecksum(in);
+        this.bytesPerChecksum = checksum.getBytesPerChecksum();
+        this.checksumSize = checksum.getChecksumSize();
+        this.buf = new byte[bytesPerChecksum + checksumSize];
         //
         // Open local disk out
         //