Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SHL-157: Prevent whole crash due to Completer

Browse Source
This commit is contained in:
Eric Bottard
2015-07-01 11:50:20 +02:00
committed by Mark Pollack
parent 5e1c90aec5
commit 21a993d6bf
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/springframework/shell/core/SimpleParser.java
View File

@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
@@ -881,10 +882,15 @@ public class SimpleParser implements Parser {
String optionContext = successiveInvocationContext + " " + option.optionContext();
if (candidate.supports(parameterType, optionContext)) {
// Found a usable converter
boolean allComplete = candidate.getAllPossibleValues(allValues, parameterType,
lastOptionValue, optionContext, methodTarget);
if (!allComplete) {
suffix = "";
try {
boolean allComplete = candidate.getAllPossibleValues(allValues, parameterType,
lastOptionValue, optionContext, methodTarget);
if (!allComplete) {
suffix = "";
}
} // Make sure completer thrown exceptions don't crash the whole process
catch (Exception e) {
LOGGER.warning(e.getMessage());
}
break;
}