Merge -r 741761:741762 from main to move the change of HADOOP-5161 to branch 0.20.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@741767 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -671,6 +671,9 @@ Release 0.19.1 - Unreleased
     HADOOP-5156. TestHeartbeatHandling uses MiiDFSCluster.getNamesystem()
     which does not exit in branch 0.19 and 0.20. (hairong)
 
+    HADOOP-5161. Accepted sockets do not get placed in
+    DataXceiverServer#childSockets. (hairong)
+
 Release 0.19.0 - 2008-11-18
 
   INCOMPATIBLE CHANGES

src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java

@@ -61,6 +61,7 @@ class DataXceiver implements Runnable, FSConstants {
     this.s = s;
     this.datanode = datanode;
     this.dataXceiverServer = dataXceiverServer;
+    dataXceiverServer.childSockets.put(s, s);
     remoteAddress = s.getRemoteSocketAddress().toString();
     localAddress = s.getLocalSocketAddress().toString();
     LOG.debug("Number of active connections is: " + datanode.getXceiverCount());