Gilad Chaplik has uploaded a new change for review.

Change subject: webadmin: NPE in new DC dialog
......................................................................

webadmin: NPE in new DC dialog

getSelectedItem was addressed without a nullity check

Change-Id: I67071f31607cae343b18099c9e806b241adb2083
Signed-off-by: Gilad Chaplik <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/10606/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
index cb1224e..47df657 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
@@ -612,7 +612,8 @@
                 && model.getQuotaEnforceTypeListModel().getSelectedItem() != 
QuotaEnforcementTypeEnum.DISABLED) {
             promptNoQuotaInDCMessage();
         }
-        else if (!((Version) 
model.getVersion().getSelectedItem()).equals(((storage_pool) 
getSelectedItem()).getcompatibility_version()))
+        else if (getSelectedItem() != null
+                && !((Version) 
model.getVersion().getSelectedItem()).equals(((storage_pool) 
getSelectedItem()).getcompatibility_version()))
         {
             ConfirmationModel confirmModel = new ConfirmationModel();
             setConfirmWindow(confirmModel);
@@ -633,7 +634,8 @@
             tempVar2.setIsCancel(true);
             confirmModel.getCommands().add(tempVar2);
         }
-        else if (((storage_pool) getSelectedItem()).getQuotaEnforcementType() 
== QuotaEnforcementTypeEnum.DISABLED
+        else if (getSelectedItem() != null
+                && ((storage_pool) 
getSelectedItem()).getQuotaEnforcementType() == 
QuotaEnforcementTypeEnum.DISABLED
                 && model.getQuotaEnforceTypeListModel().getSelectedItem() != 
QuotaEnforcementTypeEnum.DISABLED)
         {
             checkForQuotaInDC(model.getEntity(), this);


--
To view, visit http://gerrit.ovirt.org/10606
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67071f31607cae343b18099c9e806b241adb2083
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to