Repository: hadoop
Updated Branches:
  refs/heads/branch-2 073175629 -> b9dc0e597


HDFS-13311. RBF: TestRouterAdminCLI#testCreateInvalidEntry fails on Windows. 
Contributed by Inigo Goiri


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b9dc0e59
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b9dc0e59
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b9dc0e59

Branch: refs/heads/branch-2
Commit: b9dc0e597ef02eaccb6e7ba0af3f943a21d2d325
Parents: 0731756
Author: Virajith Jalaparti <viraj...@apache.org>
Authored: Mon Apr 16 16:08:36 2018 -0700
Committer: Virajith Jalaparti <viraj...@apache.org>
Committed: Mon Apr 16 16:08:36 2018 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/util/GenericOptionsParser.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b9dc0e59/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
----------------------------------------------------------------------
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
index 7b0a25c..a8a513d 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
@@ -525,6 +525,9 @@ public class GenericOptionsParser {
     }
     List<String> newArgs = new ArrayList<String>(args.length);
     for (int i=0; i < args.length; i++) {
+      if (args[i] == null) {
+        continue;
+      }
       String prop = null;
       if (args[i].equals("-D")) {
         newArgs.add(args[i]);


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to