Vojtech Szocs has uploaded a new change for review.

Change subject: webadmin: Fix FindBugs warning in ImportVmModel
......................................................................

webadmin: Fix FindBugs warning in ImportVmModel

In ImportVmModel.init() method, 'dataCenter' reference
variable can theoretically be null, which triggers FindBugs
warning "Possible null pointer dereference".

This patch fixes the above mentioned warning.

Change-Id: Ib0b452b0a998068250dc4431f1f57346f7888000
Signed-off-by: Vojtech Szocs <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
1 file changed, 34 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/12711/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
index d7ea7df..4c720c5 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
@@ -183,42 +183,44 @@
                     
getCluster().getSelectedItemChangedEvent().addListener(quotaClusterListener);
                 }
                 // get cluster
-                AsyncDataProvider.GetClusterByServiceList(new 
AsyncQuery(ImportVmModel.this, new INewAsyncCallback() {
-                    @Override
-                    public void OnSuccess(Object model, Object returnValue) {
-                        ArrayList<VDSGroup> clusters = (ArrayList<VDSGroup>) 
returnValue;
-                        getCluster().setItems(clusters);
-                        
getCluster().setSelectedItem(Linq.FirstOrDefault(clusters));
-                        // get storage domains
-                        AsyncDataProvider.GetStorageDomainList(new 
AsyncQuery(ImportVmModel.this,
-                                new INewAsyncCallback() {
+                if (dataCenter != null) {
+                    AsyncDataProvider.GetClusterByServiceList(new 
AsyncQuery(ImportVmModel.this, new INewAsyncCallback() {
+                        @Override
+                        public void OnSuccess(Object model, Object 
returnValue) {
+                            ArrayList<VDSGroup> clusters = 
(ArrayList<VDSGroup>) returnValue;
+                            getCluster().setItems(clusters);
+                            
getCluster().setSelectedItem(Linq.FirstOrDefault(clusters));
+                            // get storage domains
+                            AsyncDataProvider.GetStorageDomainList(new 
AsyncQuery(ImportVmModel.this,
+                                    new INewAsyncCallback() {
 
-                                    @Override
-                                    public void OnSuccess(Object model, Object 
returnValue) {
-                                        ArrayList<StorageDomain> 
storageDomains =
-                                                (ArrayList<StorageDomain>) 
returnValue;
-                                        // filter storage domains
-                                        filteredStorageDomains =
-                                                new ArrayList<StorageDomain>();
-                                        for (StorageDomain domain : 
storageDomains) {
-                                            if 
(Linq.IsDataActiveStorageDomain(domain)) {
-                                                
filteredStorageDomains.add(domain);
+                                        @Override
+                                        public void OnSuccess(Object model, 
Object returnValue) {
+                                            ArrayList<StorageDomain> 
storageDomains =
+                                                    (ArrayList<StorageDomain>) 
returnValue;
+                                            // filter storage domains
+                                            filteredStorageDomains =
+                                                    new 
ArrayList<StorageDomain>();
+                                            for (StorageDomain domain : 
storageDomains) {
+                                                if 
(Linq.IsDataActiveStorageDomain(domain)) {
+                                                    
filteredStorageDomains.add(domain);
+                                                }
+                                            }
+
+                                            
getStorage().setItems(filteredStorageDomains);
+                                            if (hasQuota) {
+                                                initQuotaForStorageDomains();
+                                            } else {
+                                                initDisksStorageDomainsList();
                                             }
                                         }
 
-                                        
getStorage().setItems(filteredStorageDomains);
-                                        if (hasQuota) {
-                                            initQuotaForStorageDomains();
-                                        } else {
-                                            initDisksStorageDomainsList();
-                                        }
-                                    }
-
-                                }),
-                                getStoragePool().getId());
-                    }
-                }),
-                dataCenter.getId(), true, false);
+                                    }),
+                                    getStoragePool().getId());
+                        }
+                    }),
+                    dataCenter.getId(), true, false);
+                }
             }
         }),
                 storageDomainId);


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

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

Reply via email to