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/01/17 18:57:37 UTC

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

Author: todd
Date: Tue Jan 17 17:57:36 2012
New Revision: 1232510

URL: http://svn.apache.org/viewvc?rev=1232510&view=rev
Log:
Amend HDFS-2795. Fix PersistBlocks failure due to an NPE in isPopulatingReplQueues()

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

Modified: hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.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/FSNamesystem.java?rev=1232510&r1=1232509&r2=1232510&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Tue Jan 17 17:57:36 2012
@@ -3681,7 +3681,8 @@ public class FSNamesystem implements Nam
 
   @Override
   public boolean isPopulatingReplQueues() {
-    if (!haContext.getState().shouldPopulateReplQueues()) {
+    if (haContext != null && // null during startup!
+        !haContext.getState().shouldPopulateReplQueues()) {
       return false;
     }
     // safeMode is volatile, and may be set to null at any time