You are viewing a plain text version of this content. The canonical link for it is here.

Posted to hdfs-commits@hadoop.apache.org by to...@apache.org on 2012/02/16 01:58:04 UTC

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

Author: todd
Date: Thu Feb 16 00:58:03 2012
New Revision: 1244813

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

Previous patch missed the case where the NN fails to start up when it's starting in standby state.

Modified:
    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/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=1244813&r1=1244812&r2=1244813&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 Thu Feb 16 00:58:03 2012
@@ -995,7 +995,9 @@ public class NameNode {
     @Override
     public void stopStandbyServices() throws IOException {
       // TODO(HA): Are we guaranteed to be the only active here?
-      namesystem.stopStandbyServices();
+      if (namesystem != null) {
+        namesystem.stopStandbyServices();
+      }
     }
     
     @Override