Skip to content

Fix exception-masking bugs in Script.java and DefaultModuleDefinitionSet #14498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fermosan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix exception-masking bugs in Script.java and DefaultModuleDefinitionSet #14498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ public void with(ModuleDefinition def, Stack<ModuleDefinition> parents) {
logger.debug("Failed to obtain module context: ", e);
}
} catch (BeansException e) {
logger.error("Failed to load module [{}] due to: {}", def.getName(), e);
throw new RuntimeException(String.format("Failed to load module [%s]", def.getName()));
logger.error("Failed to load module [{}]", def.getName(), e);
throw new RuntimeException(String.format("Failed to load module [%s]", def.getName()), e);
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions utils/src/main/java/com/cloud/utils/script/Script.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ private String executeInternal(OutputInterpreter interpreter, Map<String, String

String error;
if (interpreter != null) {
error = interpreter.processError(reader);
error = interpreter.drain() ? task.getResult() : interpreter.processError(reader);
} else {
error = String.valueOf(_process.exitValue());
}
Expand Down Expand Up @@ -494,7 +494,7 @@ public String executeIgnoreExitValue(OutputInterpreter interpreter, int exitValu

String error;
if (interpreter != null) {
error = interpreter.processError(reader);
error = interpreter.drain() ? task.getResult() : interpreter.processError(reader);
} else {
error = String.valueOf(_process.exitValue());
}
Expand Down
Loading