From 25f68404f37f35cb95ade6b3ff46ec427375c867 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 24 May 2013 16:44:05 +0100 Subject: [PATCH] [bs-137] "spring help" prints "Unexpected error" (when it isn't) [#50523561] --- .../org/springframework/bootstrap/cli/SpringBootstrapCli.java | 3 ++- .../springframework/bootstrap/cli/SpringBootstrapCliTests.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java b/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java index 6fc6031e25c..c4721becb6c 100644 --- a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java +++ b/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java @@ -84,8 +84,9 @@ public class SpringBootstrapCli { Set options = NO_EXCEPTION_OPTIONS; if (ex instanceof BootstrapCliException) { options = ((BootstrapCliException) ex).getOptions(); + } else { + errorMessage(ex.getMessage()); } - errorMessage(ex.getMessage()); if (options.contains(BootstrapCliException.Option.SHOW_USAGE)) { showUsage(); } diff --git a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java b/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java index e2560240358..ce21456b4be 100644 --- a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java +++ b/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java @@ -124,8 +124,7 @@ public class SpringBootstrapCliTests { public void handlesNoSuchOptionException() throws Exception { int status = this.cli.runAndHandleErrors("--missing"); assertThat(status, equalTo(1)); - assertThat(this.calls, - equalTo((Set) EnumSet.of(Call.ERROR_MESSAGE, Call.SHOW_USAGE))); + assertThat(this.calls, equalTo((Set) EnumSet.of(Call.SHOW_USAGE))); } @Test