Shahar Havivi has uploaded a new change for review. Change subject: fidbugs: Dereference after null check in CloudInitHandler ......................................................................
fidbugs: Dereference after null check in CloudInitHandler Change-Id: Ib49a16302d0d135d1839f64e1e0b79fb8ffe2f39 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/23728/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java index ed44f93..914f024 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java @@ -81,7 +81,7 @@ files.put("openstack/latest/user_data", userDataStr.getBytes("UTF-8")); // mask password for log if exists - if (metaDataStr.contains(passwordKey)) { + if (metaDataStr.contains(passwordKey) && vmInit != null && vmInit.getRootPassword() != null) { String oldStr = String.format("\"%s\" : \"%s\"", passwordKey, vmInit.getRootPassword()); String newStr = String.format("\"%s\" : ***", passwordKey); metaDataStr = metaDataStr.replace(oldStr, newStr); -- To view, visit http://gerrit.ovirt.org/23728 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib49a16302d0d135d1839f64e1e0b79fb8ffe2f39 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
