We now treat options that *can* have arguments but have none as being…

… set to "" instead of `null` (ceylon/ceylon-runtime#26)
ceylon · Oct 2, 2013 · 0f48d25 · 0f48d25
1 parent 894a28d
commit 0f48d25
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/com/redhat/ceylon/common/tool/ToolFactory.java b/src/com/redhat/ceylon/common/tool/ToolFactory.java
@@ -162,11 +162,15 @@ void processArguments() {
                         case OPTIONAL:
                         case REQUIRED:
                             argument = getLongFormArgument(arg, iter);
-                            if (argument == null && option.getArgumentType() == ArgumentType.REQUIRED) {
-                                if (iter.hasNext()) {
-                                    argument = iter.next();
+                            if (argument == null) {
+                                if (option.getArgumentType() == ArgumentType.REQUIRED) {
+                                    if (iter.hasNext()) {
+                                        argument = iter.next();
+                                    } else {
+                                        throw new OptionArgumentException.OptionWithoutArgumentException(option, arg);
+                                    }
                                 } else {
-                                    throw new OptionArgumentException.OptionWithoutArgumentException(option, arg);
+                                    argument = "";
                                 }
                             }
                             break;