HDFS-438. Check for NULL before invoking GenericArgumentParser in

DataNode. (Raghu Angadi)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@793107 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -59,6 +59,9 @@ Trunk (unreleased changes)
     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

src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

@@ -1298,9 +1298,12 @@ public class DataNode extends Configured
                                       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();