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

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

CHANGES.txt

@@ -784,6 +784,8 @@ Release 0.18.0 - 2008-08-06
 
     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/dfs/CorruptReplicasMap.java

@@ -60,8 +60,10 @@ class CorruptReplicasMap{
                                    "on " + dn.getName() +
                                    " by " + Server.getRemoteIp());
     }
-    NameNode.getNameNodeMetrics().numBlocksCorrupted.set(
+    if (NameNode.getNameNodeMetrics() != null) {
+      NameNode.getNameNodeMetrics().numBlocksCorrupted.set(
         corruptReplicasMap.size());
+    }
   }
 
   /**
@@ -72,8 +74,10 @@ 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());
+      }
     }
   }