Shahar Havivi has uploaded a new change for review. Change subject: engine: NPE when trying to run Windows with no Domain ......................................................................
engine: NPE when trying to run Windows with no Domain Change-Id: I897a372ebe8cc7575b2a3824cad7accfbc1874e3 Bug-Url:https://bugzilla.redhat.com/1063883 Signed-off-by: Shahar Havivi <shah...@redhat.com> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/24362/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java index 4934e19..007fab6 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java @@ -237,7 +237,7 @@ _writer.WriteRaw(vmBase.getDescription()); _writer.WriteEndElement(); - if (!vmInitEnabled() && vmBase.getVmInit() != null) { + if (!vmInitEnabled() && vmBase.getVmInit() != null && vmBase.getVmInit().getDomain() != null) { _writer.WriteStartElement("Domain"); _writer.WriteRaw(vmBase.getVmInit().getDomain()); _writer.WriteEndElement(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java index e4fb77a..3eb7131 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java @@ -73,13 +73,15 @@ private CreateVDSCommand<?> initCreateVDSCommand(VM vm) throws Exception { if (vm.isSysprepUsed()) { + String domain = (vm.getVmInit() != null && vm.getVmInit().getDomain() != null) ? + vm.getVmInit().getDomain() : ""; // use answer file to run after sysprep. CreateVmFromSysPrepVDSCommandParameters createVmFromSysPrepParam = new CreateVmFromSysPrepVDSCommandParameters( getVdsId(), vm, vm.getName(), - vm.getVmInit().getDomain()); + domain); createVmFromSysPrepParam.setSysPrepParams(getParameters().getSysPrepParams()); return new CreateVmFromSysPrepVDSCommand<CreateVmFromSysPrepVDSCommandParameters>(createVmFromSysPrepParam); } -- To view, visit http://gerrit.ovirt.org/24362 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I897a372ebe8cc7575b2a3824cad7accfbc1874e3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
