Added safe checks

forge · Aug 29, 2013 · c000ede · c000ede
1 parent 1ac2dd5
commit c000ede
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/shell/impl/src/main/java/org/jboss/forge/addon/shell/aesh/completion/ForgeCompletion.java b/shell/impl/src/main/java/org/jboss/forge/addon/shell/aesh/completion/ForgeCompletion.java
@@ -17,6 +17,7 @@
 import org.jboss.aesh.complete.CompleteOperation;
 import org.jboss.aesh.complete.Completion;
 import org.jboss.aesh.parser.Parser;
+import org.jboss.forge.addon.convert.ConverterFactory;
 import org.jboss.forge.addon.shell.ShellImpl;
 import org.jboss.forge.addon.shell.aesh.AbstractShellInteraction;
 import org.jboss.forge.addon.shell.ui.ShellContext;
@@ -95,11 +96,15 @@ else if (completeObject.isArgument())
                   input = null;
                }
                String typedValue = completeObject.getValue();
+               if (typedValue == null)
+               {
+                  typedValue = "";
+               }
                if (input != null)
                {
+                  ConverterFactory converterFactory = shell.getConverterFactory();
                   CompletionStrategy completionObj = CompletionStrategyFactory.getCompletionFor(input);
-                  completionObj.complete(completeOperation, input, shellContext, typedValue,
-                           shell.getConverterFactory());
+                  completionObj.complete(completeOperation, input, shellContext, typedValue, converterFactory);
                }
                // if we only have one complete candidate, leave the escaped space be
                List<String> candidates = completeOperation.getCompletionCandidates();