HADOOP-3897. Fix a NPE in secondary namenode. Contributed by Lohit Vijayarenu

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@683348 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1006,6 +1006,8 @@ Release 0.18.0 - Unreleased
 
     HADOOP-3837. Streaming jobs report progress status. (dhruba)
 
+    HADOOP-3897. Fix a NPE in secondary namenode. (Lohit Vijayarenu via cdouglas)
+
 Release 0.17.2 - Unreleased
 
   BUG FIXES

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

@@ -61,8 +61,10 @@ public class CorruptReplicasMap{
                                    "on " + dn.getName() +
                                    " by " + Server.getRemoteIp());
     }
-    NameNode.getNameNodeMetrics().numBlocksCorrupted.set(
+    if (NameNode.getNameNodeMetrics() != null) {
+      NameNode.getNameNodeMetrics().numBlocksCorrupted.set(
         corruptReplicasMap.size());
+    }
   }
 
   /**
@@ -73,8 +75,10 @@ public class CorruptReplicasMap{
   void removeFromCorruptReplicasMap(Block blk) {
     if (corruptReplicasMap != null) {
       corruptReplicasMap.remove(blk);
-      NameNode.getNameNodeMetrics().numBlocksCorrupted.set(
+      if (NameNode.getNameNodeMetrics() != null) {
+        NameNode.getNameNodeMetrics().numBlocksCorrupted.set(
           corruptReplicasMap.size());
+      }
     }
   }