Yaniv Bronhaim has uploaded a new change for review. Change subject: core: ConfigurationProvider throw error with invalid parameters ......................................................................
core: ConfigurationProvider throw error with invalid parameters Throwing ManageDomainsResult by ConfigureationProvider included array of strings. ManageDomainsResult ctor reads the parameters one by one and not by array of values. Change-Id: Idd0f237b7941407def0f7d6869cca469419930df Signed-off-by: Yaniv Bronhaim <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java 2 files changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/7605/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java index 435a1d1..8b81809 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java @@ -95,19 +95,22 @@ try { passFile = createPassFile(entry.getDomainsConfigurationEntry()); - Process engineConfigProcess = - Runtime.getRuntime().exec(engineConfigExecutable + " -s " - + enumValue.name() + ((passedAsValue) ? "=" + entry.getDomainsConfigurationEntry() : - " --admin-pass-file " + passFile.getAbsolutePath()) - + " -p " + engineConfigProperties); + String exeStr = engineConfigExecutable + " -s " + + enumValue.name() + ((passedAsValue) ? "=" + entry.getDomainsConfigurationEntry() : + " --admin-pass-file " + passFile.getAbsolutePath()) + + " -p " + engineConfigProperties; + + Process engineConfigProcess = Runtime.getRuntime().exec(exeStr); + int retVal = engineConfigProcess.waitFor(); if (retVal != 0) { - throw new ManageDomainsResult(ManageDomainsResultEnum.FAILED_SETTING_CONFIGURATION_VALUE_FOR_OPTION, - enumValue.name()); + ManageDomainsResult res = new ManageDomainsResult(ManageDomainsResultEnum.FAILED_SETTING_CONFIGURATION_VALUE_FOR_OPTION, + enumValue.name() + "the line we excute is: " + exeStr); + throw res; } } catch (Throwable e) { throw new ManageDomainsResult(ManageDomainsResultEnum.FAILED_SETTING_CONFIGURATION_VALUE_FOR_OPTION_WITH_DETAILS, - new String[] { enumValue.name(), e.getMessage() }); + enumValue.name(), e.getMessage()); } finally { disposePassFile(passFile); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java index cca6062..3ff3e24 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java @@ -64,7 +64,8 @@ else { if (StringUtils.isEmpty(defaultMsg)) { log.debug("No default param passed."); - this.detailedMessage = "Error with output, no default message to show. sorry.."; + this.detailedMessage = enumResult.getDetailedMessage() + + ": One of the parameters for this error is null and no default message to show"; } else { this.detailedMessage = defaultMsg; -- To view, visit http://gerrit.ovirt.org/7605 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd0f237b7941407def0f7d6869cca469419930df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
