[Engine-patches] Change in ovirt-engine[master]: webadmin: prevent npe on VdcActionUtils canExecute

[derez]

Daniel Erez has uploaded a new change for review.

Change subject: webadmin: prevent npe on VdcActionUtils canExecute
......................................................................

webadmin: prevent npe on VdcActionUtils canExecute

VmSnapshotListModel -> updateActionAvailability:
passing an empty list to VdcActionUtils.canExecute
when VM is null to avoid an NPE.

Change-Id: I63e3570b48f8039642a5f1ce3af1f9c4599d688c
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/20446/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
index 24a7d2e..36c8748 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
@@ -694,6 +694,7 @@
     {
         VM vm = (VM) getEntity();
         Snapshot snapshot = (Snapshot) getSelectedItem();
+        List<VM> vmList = vm != null ? Collections.singletonList(vm) : 
Collections.<VM> emptyList();
 
         boolean isVmDown = vm != null && vm.getStatus() == VMStatus.Down;
         boolean isVmImageLocked = vm != null && vm.getStatus() == 
VMStatus.ImageLocked;
@@ -704,7 +705,7 @@
         boolean isCloneVmSupported = getIsCloneVmSupported();
 
         getCanSelectSnapshot().setEntity(!isPreviewing && !isLocked && 
!isStateless
-                && VdcActionUtils.canExecute(Arrays.asList(vm), VM.class, 
VdcActionType.CreateAllSnapshotsFromVm));
+                && VdcActionUtils.canExecute(vmList, VM.class, 
VdcActionType.CreateAllSnapshotsFromVm));
         getNewCommand().setIsExecutionAllowed(!isPreviewing && !isLocked && 
!isVmImageLocked && !isStateless);
         getPreviewCommand().setIsExecutionAllowed(isSelected && !isLocked && 
!isPreviewing && isVmDown && !isStateless);
         getCommitCommand().setIsExecutionAllowed(isPreviewing && isVmDown && 
!isStateless);


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63e3570b48f8039642a5f1ce3af1f9c4599d688c
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