Tal Nisan has uploaded a new change for review.

Change subject: webadmin: Fix NPE in DiskListModel
......................................................................

webadmin: Fix NPE in DiskListModel

Change-Id: Ia610a8ac2e2d9a023a4be9d2da0e7db1806bd7a6
Signed-off-by: Tal Nisan <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/15995/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
index 838ac89..4434577 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
@@ -452,14 +452,12 @@
         boolean isCopyAllowed = true;
         boolean isMoveAllowed = true;
 
-        Disk firstDisk = disks.get(0);
-
-        if (disks == null || disks.isEmpty() || firstDisk.getDiskStorageType() 
!= DiskStorageType.IMAGE) {
+        if (disks == null || disks.isEmpty() || 
disks.get(0).getDiskStorageType() != DiskStorageType.IMAGE) {
             disableMoveAndCopyCommands();
             return;
         }
 
-        NGuid datacenterId = ((DiskImage) firstDisk).getStoragePoolId();
+        NGuid datacenterId = ((DiskImage) disks.get(0)).getStoragePoolId();
 
         for (Disk disk : disks) {
             if ((!isCopyAllowed && !isMoveAllowed) || 
disk.getDiskStorageType() != DiskStorageType.IMAGE) {


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

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

Reply via email to