Repository: hadoop Updated Branches: refs/heads/branch-3.1 43a2af556 -> 70830d9f9
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/70830d9f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/70830d9f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/70830d9f Branch: refs/heads/branch-3.1 Commit: 70830d9f9c82f7315b17c5f679879ab1a739dda1 Parents: 43a2af5 Author: Virajith Jalaparti <viraj...@apache.org> Authored: Mon Apr 16 16:06:25 2018 -0700 Committer: Virajith Jalaparti <viraj...@apache.org> Committed: Mon Apr 16 16:06:25 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/70830d9f/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
