Shahar Havivi has uploaded a new change for review. Change subject: engine: findbugs possible null pointer dereference ......................................................................
engine: findbugs possible null pointer dereference fix from commit d46ebd8712f369b924e199b82197e59568a686ff Change-Id: Icb9829514f49cb7f371b31acc018112beda477fb Bug-Url: https://bugzilla.redhat.com/1051041 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/21/24521/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 de626cd..4bbd7f2 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 @@ -70,7 +70,7 @@ String metaDataStr = mapToJson(metaData); String userDataStr = mapToYaml(userData); - if (vmInit.getCustomScript() != null) { + if (vmInit != null && vmInit.getCustomScript() != null) { userDataStr += vmInit.getCustomScript(); } -- To view, visit http://gerrit.ovirt.org/24521 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb9829514f49cb7f371b31acc018112beda477fb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
