svn commit: r1244186 - in /hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs: CHANGES.HDFS-1623.txt src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java

[todd]

Author: todd
Date: Tue Feb 14 19:38:02 2012
New Revision: 1244186

URL: http://svn.apache.org/viewvc?rev=1244186&view=rev
Log:
HDFS-2948. NN throws NPE during shutdown if it fails to startup. Contributed by 
Todd Lipcon.

Modified:
    
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
    
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java

Modified: 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt?rev=1244186&r1=1244185&r2=1244186&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
 (original)
+++ 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
 Tue Feb 14 19:38:02 2012
@@ -200,3 +200,5 @@ HDFS-2939. TestHAStateTransitions fails 
 HDFS-2947. On startup NN throws an NPE in the metrics system. (atm)
 
 HDFS-2942. TestActiveStandbyElectorRealZK fails if build dir does not exist. 
(atm)
+
+HDFS-2948. NN throws NPE during shutdown if it fails to startup (todd)

Modified: 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1244186&r1=1244185&r2=1244186&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
 (original)
+++ 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
 Tue Feb 14 19:38:02 2012
@@ -974,7 +974,9 @@ public class NameNode {
 
     @Override
     public void stopActiveServices() throws IOException {
-      namesystem.stopActiveServices();
+      if (namesystem != null) {
+        namesystem.stopActiveServices();
+      }
       stopTrashEmptier();
     }