hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r664201 - in /hadoop/core/trunk: CHANGES.txt src/java/org/apache/hadoop/dfs/FSNamesystem.java
Date Fri, 06 Jun 2008 23:48:28 GMT
Author: shv
Date: Fri Jun  6 16:48:28 2008
New Revision: 664201

URL: http://svn.apache.org/viewvc?rev=664201&view=rev
Log:
HADOOP-3489. Fix NPE in SafeModeMonitor. Contributed by Lohit Vijayarenu.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=664201&r1=664200&r2=664201&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Jun  6 16:48:28 2008
@@ -524,6 +524,8 @@
 
     HADOOP-3463. Hadoop-daemons script should cd to $HADOOP_HOME. (omalley)
 
+    HADOOP-3489. Fix NPE in SafeModeMonitor. (Lohit Vijayarenu via shv)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java?rev=664201&r1=664200&r2=664201&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java (original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java Fri Jun  6 16:48:28
2008
@@ -3948,7 +3948,7 @@
     /**
      */
     public void run() {
-      while (fsRunning && !safeMode.canLeave()) {
+      while (fsRunning && (safeMode != null && !safeMode.canLeave())) {
         try {
           Thread.sleep(recheckInterval);
         } catch (InterruptedException ie) {



Mime
View raw message