Daniel Erez has uploaded a new change for review.

Change subject: webadmin: avoid null cluster on VmModel update vscsi
......................................................................

webadmin: avoid null cluster on VmModel update vscsi

Avoid null cluster on VmModelBehaviorBase -> updateVirtioScsiEnabled.

Change-Id: Ie002f8d84b7e6449b179703dd471f674ca0e3f05
Related-To-Bug-Url: https://bugzilla.redhat.com/1038613
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/23910/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
index 4e01c3e..c901cf9 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
@@ -1145,10 +1145,12 @@
     }
 
     protected void updateVirtioScsiEnabled(final Guid vmId, int osId) {
-        VDSGroup cluster = getModel().getSelectedCluster();
-        Version clusterVersion = cluster != null ? 
cluster.getcompatibility_version() : null;
+        final VDSGroup cluster = getModel().getSelectedCluster();
+        if (cluster == null) {
+            return;
+        }
 
-        AsyncDataProvider.getDiskInterfaceList(osId, clusterVersion,
+        AsyncDataProvider.getDiskInterfaceList(osId, 
cluster.getcompatibility_version(),
             new AsyncQuery(getModel(), new INewAsyncCallback() {
                 @Override
                 public void onSuccess(Object model, Object returnValue) {


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie002f8d84b7e6449b179703dd471f674ca0e3f05
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to