[bs-137] "spring help" prints "Unexpected error" (when it isn't)

[#50523561]

Author: Dave Syer

spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java

@@ -84,8 +84,9 @@ public int runAndHandleErrors(String... args) {
 			Set<BootstrapCliException.Option> 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();
 			}

spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java

@@ -124,8 +124,7 @@ public void handlesNoArgumentsException() throws Exception {
 	public void handlesNoSuchOptionException() throws Exception {
 		int status = this.cli.runAndHandleErrors("--missing");
 		assertThat(status, equalTo(1));
-		assertThat(this.calls,
-				equalTo((Set<Call>) EnumSet.of(Call.ERROR_MESSAGE, Call.SHOW_USAGE)));
+		assertThat(this.calls, equalTo((Set<Call>) EnumSet.of(Call.SHOW_USAGE)));
 	}
 
 	@Test