Shahar Havivi has uploaded a new change for review. Change subject: ui: make template - NPE in wrong display type ......................................................................
ui: make template - NPE in wrong display type when creating a template from a VM with a display type that is not supported the os we get NPE when setting the VMs display type to the template. (caused by upgrading an old version) Change-Id: I6921c7f620c9de2e3cc0293c096d48418f509f55 Signed-off-by: Shahar Havivi <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/30677/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index d198664..a2046fd 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; - import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; import org.ovirt.engine.core.common.action.AddVmFromTemplateParameters; @@ -1400,7 +1399,11 @@ VM newvm = tempVar; EntityModel<DisplayType> displayProtocolSelectedItem = model.getDisplayProtocol().getSelectedItem(); - newvm.setDefaultDisplayType(displayProtocolSelectedItem.getEntity()); + if (displayProtocolSelectedItem != null) { + newvm.setDefaultDisplayType(displayProtocolSelectedItem.getEntity()); + } else { + newvm.setDefaultDisplayType(DisplayType.vnc); + } EntityModel<Integer> prioritySelectedItem = model.getPriority().getSelectedItem(); newvm.setPriority(prioritySelectedItem.getEntity()); @@ -2007,7 +2010,11 @@ getcurrentVm().setBalloonEnabled(balloonEnabled(model)); EntityModel<DisplayType> displayProtocolSelectedItem = model.getDisplayProtocol().getSelectedItem(); - getcurrentVm().setDefaultDisplayType(displayProtocolSelectedItem.getEntity()); + if (displayProtocolSelectedItem != null) { + getcurrentVm().setDefaultDisplayType(displayProtocolSelectedItem.getEntity()); + } else { + getcurrentVm().setDefaultDisplayType(DisplayType.vnc); + } EntityModel<Integer> prioritySelectedItem = model.getPriority().getSelectedItem(); getcurrentVm().setPriority(prioritySelectedItem.getEntity()); -- To view, visit http://gerrit.ovirt.org/30677 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6921c7f620c9de2e3cc0293c096d48418f509f55 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
