Ravi Nori has uploaded a new change for review. Change subject: tools: rhevm-manage-domains -passwordFile=<existing empty file> throws exception (#870052) ......................................................................
tools: rhevm-manage-domains -passwordFile=<existing empty file> throws exception (#870052) When running rhevm-manage-domains with -passwordFile=pass, a NullPointerException is thrown when the passowrd file exists but is empty. Change-Id: Id3b6ffcad4ae402ffce2adcaf023068da024ee81 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=870052 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResultEnum.java 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/8965/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java index bd72938..a373042 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java @@ -284,6 +284,9 @@ } catch (Exception e) { throw new ManageDomainsResult(ManageDomainsResultEnum.FAILURE_READING_PASSWORD_FILE, e.getMessage()); } + if (pass == null) { + throw new ManageDomainsResult(ManageDomainsResultEnum.EMPTY_PASSWORD_FILE); + } } else if (parser.hasArg(Arguments.interactive.name())) { pass = readPasswordInteractively(); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResultEnum.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResultEnum.java index 9dea551..5df1fed 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResultEnum.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResultEnum.java @@ -32,7 +32,8 @@ UNKNOWN_ERROR( "Operation failed due to exception. Details: %1$s", 20), - FAILURE_READING_PASSWORD_FILE("failed reading password from password file", 21); + FAILURE_READING_PASSWORD_FILE("failed reading password from password file", 21), + EMPTY_PASSWORD_FILE("password file is empty", 22); private String detailedMessage; private final int exitCode; -- To view, visit http://gerrit.ovirt.org/8965 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3b6ffcad4ae402ffce2adcaf023068da024ee81 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
