hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hair...@apache.org
Subject svn commit: r1035712 - /hadoop/common/branches/branch-0.20-append/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferProtocol.java
Date Tue, 16 Nov 2010 17:53:17 GMT
Author: hairong
Date: Tue Nov 16 17:53:17 2010
New Revision: 1035712

URL: http://svn.apache.org/viewvc?rev=1035712&view=rev
Log:
Fix incorrect heartbeat ack serialization in HDFS-724 for append 0.20. Contributed by Hairong
Kuang.

Modified:
    hadoop/common/branches/branch-0.20-append/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferProtocol.java

Modified: hadoop/common/branches/branch-0.20-append/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-append/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferProtocol.java?rev=1035712&r1=1035711&r2=1035712&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-append/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferProtocol.java
(original)
+++ hadoop/common/branches/branch-0.20-append/src/hdfs/org/apache/hadoop/hdfs/protocol/DataTransferProtocol.java
Tue Nov 16 17:53:17 2010
@@ -120,14 +120,9 @@ public interface DataTransferProtocol {
       assert numRepliesExpected > 0;
 
       seqno = in.readLong();
-      if (seqno == HEARTBEAT_SEQNO) {
-        // Heartbeat doesn't forward any replies
-        replies = new short[0];
-      } else {
-        replies = new short[numRepliesExpected];
-        for (int i=0; i < replies.length; i++) {
-          replies[i] = in.readShort();
-        }
+      replies = new short[numRepliesExpected];
+      for (int i=0; i < replies.length; i++) {
+    	  replies[i] = in.readShort();
       }
     }
 



Mime
View raw message