modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit ca4fdfafa7546c03d6d809d2c01a50f8cedc4432 Author: Jirka Kremser jkremser@redhat.com Date: Wed Mar 6 12:24:27 2013 +0100
[BZ 894493] - [as7] Start operation returns failure when start script returns exit code 0 (success). Added the test for the exit[C code. (cherry-pick from c0fe931b74ac8eccfc5be8af2275bea5d8c0c917)
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java index 98a46d2..b4c7aa4 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java @@ -330,8 +330,9 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend logExecutionResults(results); if (results.getError() != null) { operationResult.setErrorMessage(results.getError().getMessage()); - } else if (results.getExitCode() != null) { - operationResult.setErrorMessage("Start failed with error code " + results.getExitCode() + ":\n" + results.getCapturedOutput()); + } else if (results.getExitCode() != null && results.getExitCode() != 0) { + operationResult.setErrorMessage("Start failed with error code " + results.getExitCode() + ":\n" + + results.getCapturedOutput()); } else { // Try to connect to the server - ping once per second, timing out after 20s. boolean up = waitForServerToStart();
rhq-commits@lists.fedorahosted.org