Martin Beták has uploaded a new change for review.

Change subject: webadmin: Fix NPE in Edit Pool Dialog
......................................................................

webadmin: Fix NPE in Edit Pool Dialog

Creation of the dialog was failing due to NPE in
DisksAllocationModel.sortDisks() when the list of disks was null.

Added relevant null-check.

Change-Id: I83e3d1308519d1abb49cd31a3fe3298d517e7aa6
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=959936
Signed-off-by: Martin Betak <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/14507/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java
index 40c44fb..013ee7b 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java
@@ -63,8 +63,10 @@
     }
 
     public void sortDisks() {
-        Linq.sort(disks, new DiskModelByAliasComparer());
-        onPropertyChanged(new PropertyChangedEventArgs("Disks")); //$NON-NLS-1$
+        if (disks != null) {
+            Linq.sort(disks, new DiskModelByAliasComparer());
+            onPropertyChanged(new PropertyChangedEventArgs("Disks")); 
//$NON-NLS-1$
+        }
     }
 
     private HashMap<Guid, DiskImage> imageToDestinationDomainMap;


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

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

Reply via email to