Skip to content

Commit 001095f

Browse files
committed
add exit code to CLIDriver and revert changes in CreateImage of rethrowing exception - will solve the missing stdout later
1 parent e0d466d commit 001095f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/com/oracle/weblogicx/imagebuilder/cli/CLIDriver.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public static void main(String[] args) {
4141
CLIDriver cliDriver = new CLIDriver();
4242
if (args.length == 0) {
4343
CommandLine.usage(cliDriver, System.out);
44+
System.exit(-1);
4445
} else {
4546
//List<String> argsList = Stream.of(args).collect(Collectors.toList());
4647
//argsList.add("--cli");
@@ -52,9 +53,9 @@ public static void main(String[] args) {
5253
response.getMessage()));
5354
//Map<String, String> results = response.getResult();
5455
//results.forEach((key, value) -> System.out.println(key + "=" + value));
55-
}/* else {
56-
System.out.println("response is null");
57-
}*/
56+
System.exit(response.getStatus());
57+
}
58+
System.exit(-1);
5859
}
5960
}
6061
}

src/main/java/com/oracle/weblogicx/imagebuilder/cli/menu/CreateImage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ public CommandResponse call() throws Exception {
122122
logger.info("docker cmd = " + String.join(" ", cmdBuilder));
123123
Utils.runDockerCommand(isCLIMode, cmdBuilder, dockerLog);
124124
} catch (Exception ex) {
125-
throw ex;
126-
// return new CommandResponse(-1, ex.getMessage());
125+
return new CommandResponse(-1, ex.getMessage());
127126
} finally {
128127
Utils.deleteFilesRecursively(tmpDir);
129128
Utils.deleteFilesRecursively(tmpDir2);

0 commit comments

Comments
 (0)