Tal Nisan has submitted this change and it was merged. Change subject: webadmin: fix UploadDiskModel validation and flush. ...................................................................... webadmin: fix UploadDiskModel validation and flush. Currently, the validation of the model gets a parameter that determines if the object's diskModel validation will be called. When starting the upload, this function is called 2 times, once when flushing, then before starting the upload. In case that the diskModel validation failed, it didn't flush, causing an NPE when calling onUpload() without filling the needed fields- as the diskModel validation is not called before flushing. This patch makes the validation always call to the diskModel validation, and makes flush() to return false if the model wasn't able to flush. Change-Id: I2fc1942ffffd60254d1344fce582afbb6562c697 Bug-Url: https://bugzilla.redhat.com/1328887 Signed-off-by: Amit Aviram <aaviram@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/UploadImageModel.java 1 file changed, 15 insertions(+), 22 deletions(-) Approvals: Daniel Erez: Looks good to me, approved Jenkins CI: Passed CI tests Amit Aviram: Verified -- To view, visit https://gerrit.ovirt.org/59456 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fc1942ffffd60254d1344fce582afbb6562c697 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-4.0 Gerrit-Owner: Amit Aviram <aaviram@redhat.com> Gerrit-Reviewer: Amit Aviram <aaviram@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>