Vitor de Lima has uploaded a new change for review. Change subject: webadmin: Fix NPE during OS selection ......................................................................
webadmin: Fix NPE during OS selection This fixes some NPEs in the oSType_SelectedItemChanged() method of 3 behaviors associated with the UnitVmModel class. These were caused by an implicit cast from Integer to int of the currently selected OS. Change-Id: I94b2aef851431fad201c77eec97a74a0fe61396b Signed-off-by: Vitor de Lima <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java 3 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/23921/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java index 37448ee..3d5fd9a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java @@ -333,8 +333,11 @@ @Override public void oSType_SelectedItemChanged() { - int osType = getModel().getOSType().getSelectedItem(); - updateVirtioScsiEnabled(vm.getId(), osType); + Integer osType = getModel().getOSType().getSelectedItem(); + + if (osType != null) { + updateVirtioScsiEnabled(vm.getId(), osType); + } } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java index 4e3876b..455a861 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java @@ -271,8 +271,8 @@ @Override public void oSType_SelectedItemChanged() { VmTemplate template = getModel().getTemplate().getSelectedItem(); - int osType = getModel().getOSType().getSelectedItem(); - if (template != null) { + Integer osType = getModel().getOSType().getSelectedItem(); + if (template != null && osType != null) { updateVirtioScsiEnabled(template.getId(), osType); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java index a91fd1e..561b7df 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java @@ -238,8 +238,8 @@ @Override public void oSType_SelectedItemChanged() { VmTemplate template = getModel().getTemplate().getSelectedItem(); - int osType = getModel().getOSType().getSelectedItem(); - if (template != null) { + Integer osType = getModel().getOSType().getSelectedItem(); + if (template != null && osType != null) { updateVirtioScsiEnabled(template.getId(), osType); } } -- To view, visit http://gerrit.ovirt.org/23921 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94b2aef851431fad201c77eec97a74a0fe61396b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vitor de Lima <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
