Merge -r 723917:723918 from trunk to move the change log of HADOOP-4742 into branch 0.19

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

CHANGES.txt

@@ -1068,6 +1068,8 @@ Release 0.18.3 - Unreleased
     HADOOP-4778. Check for zero size block meta file when updating a block.
     (szetszwo)
 
+    HADOOP-4742. Replica gets deleted by mistake. (Wang Xu via hairong)
+
 Release 0.18.2 - 2008-11-03
 
   BUG FIXES

src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

@@ -3279,8 +3279,8 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean {
     //
     // Modify the blocks->datanode map and node's map.
     // 
-    addStoredBlock(block, node, delHintNode );
     pendingReplications.remove(block);
+    addStoredBlock(block, node, delHintNode );
   }
 
   long[] getStats() throws IOException {