Arik Hadas has uploaded a new change for review.
Change subject: core: prevent possible NPE
......................................................................
core: prevent possible NPE
Coverity scan founded that NPE might be thrown in
ImportCommandBase#logImportEvents in case aliasesValuesMap is null.
Thus, null check is added before using the aliasesValuesMap variable.
Change-Id: I43a287f7245da2a4a0e10a71c58613c10df060f2
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/35953/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java
index c94b49f..a85b802 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java
@@ -250,10 +250,12 @@
OvfLogEventHandler<VmStatic> handler = new
VMStaticOvfLogHandler(vmStaticFromOvf);
Map<String, String> aliasesValuesMap = handler.getAliasesValuesMap();
- for (Map.Entry<String, String> entry : aliasesValuesMap.entrySet()) {
- String fieldName = entry.getKey();
- String fieldValue = entry.getValue();
- logField(vmStaticFromOvf, fieldName, fieldValue);
+ if (aliasesValuesMap != null) {
+ for (Map.Entry<String, String> entry :
aliasesValuesMap.entrySet()) {
+ String fieldName = entry.getKey();
+ String fieldValue = entry.getValue();
+ logField(vmStaticFromOvf, fieldName, fieldValue);
+ }
}
handler.resetDefaults(vmStaticForDefaultValues);
--
To view, visit http://gerrit.ovirt.org/35953
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43a287f7245da2a4a0e10a71c58613c10df060f2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
