Change in ovirt-engine[master]: frontend: NPE in Import*Model
Tomas Jelinek has submitted this change and it was merged.
Change subject: frontend: NPE in Import*Model
......................................................................
frontend: NPE in Import*Model
There was a NPE vulnerability in ImportTemplateModel and ImportVmModel.
The problem was that the VmBackupModel.restore() called first the
setItems() and than init(). The setItems have done some async call
and set the result to the super.setItems(), while the init() already
needed this in initDisksStorageDomainsList() method (which is also
called in a callback). So if the callback from setItems returned sooner
than the ones in init() it worked. If not, the initDisksStorageDomainsList
failed on NPE.
Fixed by calling the real init() logic only when the data are really prepared.
Change-Id: Id97c8368ecf80ceb7ef1aa456d32a022dd5043bb
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1019862
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
3 files changed, 68 insertions(+), 63 deletions(-)
Approvals:
Tomas Jelinek: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/20243
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id97c8368ecf80ceb7ef1aa456d32a022dd5043bb
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server