hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r525268 - in /lucene/hadoop/trunk: CHANGES.txt src/test/org/apache/hadoop/dfs/MiniDFSCluster.java
Date Tue, 03 Apr 2007 20:37:18 GMT
Author: cutting
Date: Tue Apr  3 13:37:17 2007
New Revision: 525268

URL: http://svn.apache.org/viewvc?view=rev&rev=525268
Log:
HADOOP-1156.  Fix a NullPointerException in MiniDFSCluster.  Contributed by Hairong.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=525268&r1=525267&r2=525268
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Apr  3 13:37:17 2007
@@ -91,6 +91,9 @@
 28. HADOOP-1045.  Add contrib/hbase, a BigTable-like online database.
     (Jim Kellerman via cutting)
 
+29. HADOOP-1156.  Fix a NullPointerException in MiniDFSCluster.
+    (Hairong Kuang via cutting)
+
 
 Release 0.12.3 (not yet released)
 

Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java?view=diff&rev=525268&r1=525267&r2=525268
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java Tue Apr  3 13:37:17
2007
@@ -90,7 +90,7 @@
           isInitialized = true;
         }
       } catch (Throwable e) {
-        node = null;
+        shutdown();
         System.err.println("Name node crashed:");
         e.printStackTrace();
         synchronized (this) {
@@ -107,6 +107,7 @@
       if (node != null) {
         node.stop();
         node.join();
+        node = null;
       }
     }
   }
@@ -157,8 +158,7 @@
         }
         node.run();
       } catch (Throwable e) {
-        node.shutdown();
-        node = null;
+        shutdown();
         System.err.println("Data node crashed:");
         e.printStackTrace();
       }
@@ -171,6 +171,7 @@
       isRunning = false;
       if (node != null) {
         node.shutdown();
+        node = null;
       }
     }
   }



Mime
View raw message