Libor Spevak has uploaded a new change for review.
Change subject: webadmin: Possible NPE fixed
......................................................................
webadmin: Possible NPE fixed
Set correctly data center as the first element in the array in ImportVM model.
Else skip dialog initialization - FindBugs warning removed.
Change-Id: Ic44ce88f074d8847ef8d97510e7014fe239fe822
Signed-off-by: Libor Spevak <lspe...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/12707/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..283ee74 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
@@ -10,12 +10,12 @@
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.Quota;
import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum;
+import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.businessentities.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.VolumeType;
-import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.queries.DiskImageList;
@@ -167,15 +167,14 @@
@Override
public void OnSuccess(Object model, Object returnValue) {
ArrayList<storage_pool> pools = (ArrayList<storage_pool>)
returnValue;
- storage_pool dataCenter = null;
- if (pools != null && pools.size() == 1) {
- dataCenter = pools.get(0);
- } else {
- //TODO internal client ERROR
+ if (pools == null || pools.size() != 1) {
+ return;
}
+
+ storage_pool dataCenter = pools.get(0);
setStoragePool(dataCenter);
// show quota
- if (dataCenter != null && dataCenter.getQuotaEnforcementType()
!= QuotaEnforcementTypeEnum.DISABLED) {
+ if (dataCenter.getQuotaEnforcementType() !=
QuotaEnforcementTypeEnum.DISABLED) {
hasQuota = true;
}
if (hasQuota) {
--
To view, visit http://gerrit.ovirt.org/12707
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic44ce88f074d8847ef8d97510e7014fe239fe822
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Libor Spevak <lspe...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
