svn commit: r793107 - in /hadoop/hdfs/trunk: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

[rangadi]

Author: rangadi
Date: Fri Jul 10 20:57:24 2009
New Revision: 793107

URL: http://svn.apache.org/viewvc?rev=793107&view=rev
Log:
HDFS-438. Check for NULL before invoking GenericArgumentParser in
DataNode. (Raghu Angadi)

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=793107&r1=793106&r2=793107&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri Jul 10 20:57:24 2009
@@ -59,6 +59,9 @@
     HDFS-480. Fix a typo in the jar name in build.xml.  
     (Konstantin Shvachko via gkesavan)
 
+    HDFS-438. Check for NULL before invoking GenericArgumentParser in
+    DataNode. (Raghu Angadi)
+
 Release 0.20.1 - Unreleased
 
   IMPROVEMENTS

Modified: 
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=793107&r1=793106&r2=793107&view=diff
==============================================================================
--- 
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java 
(original)
+++ 
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java 
Fri Jul 10 20:57:24 2009
@@ -1298,9 +1298,12 @@
                                       Configuration conf) throws IOException {
     if (conf == null)
       conf = new Configuration();
-    // parse generic hadoop options
-    GenericOptionsParser hParser = new GenericOptionsParser(conf, args);
-    args = hParser.getRemainingArgs();
+    
+    if (args != null) {
+      // parse generic hadoop options
+      GenericOptionsParser hParser = new GenericOptionsParser(conf, args);
+      args = hParser.getRemainingArgs();
+    }
     
     if (!parseArguments(args, conf)) {
       printUsage();