Amit Aviram has uploaded a new change for review. Change subject: webadmin: StorageListModel fix for Coveritiy scan. ......................................................................
webadmin: StorageListModel fix for Coveritiy scan. A coveritiy scan have found a null dereference in a recent StorageListModel patch. Although the scenerio tested can never happen, this patch updates the code to still check nullity and prevent any chance of NullPointerException resulting from another potential bug. Change-Id: I028eaeb0c6f579cedaf135692b3c23bcdda0d0b9 Signed-off-by: Amit Aviram <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/38642/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index d6179bb..23e8841 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -377,9 +377,11 @@ private IStorageModel prepareStorageForEdit(StorageDomain storage, StorageModel model) { final IStorageModel storageTypeModel = getStorageModelByStorage(storage); - storageTypeModel.setContainer(model); - storageTypeModel.setRole(storage.getStorageDomainType()); - storageTypeModel.prepareForEdit(storage); + if (storageTypeModel != null) { + storageTypeModel.setContainer(model); + storageTypeModel.setRole(storage.getStorageDomainType()); + storageTypeModel.prepareForEdit(storage); + } return storageTypeModel; } -- To view, visit https://gerrit.ovirt.org/38642 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I028eaeb0c6f579cedaf135692b3c23bcdda0d0b9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Amit Aviram <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
