Federico Simoncelli has uploaded a new change for review.
Change subject: core: fix AddVmParameters for null diskInfoList
......................................................................
core: fix AddVmParameters for null diskInfoList
In change I06f2de3db1b0559af4df04d0d158b10b8460c684:
b7804ad core: cleanup AddVmParameters constructors
the logic in charge to ensure that diskInfoList is never null was
removed.
When a new VM is added from rest-api addVmFromScratch(...) sets
diskInfoList to a null value:
AddVmParameters params = new AddVmParameters(staticVm);
params.setDiskInfoList(mapDisks(vm.getDisks()));
resulting in a NPE:
ERROR [AddVmFromScratchCommand] Error during CanDoActionFailure:
java.lang.NullPointerException
at checkImagesConfiguration(ImagesHandler.java:455) [bll.jar:]
at canDoAction(AddVmFromScratchCommand.java:150) [bll.jar:]
at internalCanDoAction(CommandBase.java:746) [bll.jar:]
Change-Id: I979bd6373e4a1440f88d27e416bd2e116b010891
Signed-off-by: Federico Simoncelli <[email protected]>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/33294/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java
index c8c53b9..bf01a75 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java
@@ -30,7 +30,7 @@
}
public void setDiskInfoList(ArrayList<DiskImage> diskInfoList) {
- this.diskInfoList = diskInfoList;
+ this.diskInfoList = diskInfoList != null ? diskInfoList : new
ArrayList<DiskImage>();
}
public TemplateProvisioningMethod getTemplateProvisioningMethod() {
--
To view, visit http://gerrit.ovirt.org/33294
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I979bd6373e4a1440f88d27e416bd2e116b010891
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
