[Engine-patches] Change in ovirt-engine[master]: core: prevent potential npe in VmConfigurationHelper

[derez]

Daniel Erez has uploaded a new change for review.

Change subject: core: prevent potential npe in VmConfigurationHelper
......................................................................

core: prevent potential npe in VmConfigurationHelper

SnapshotVmConfigurationHelper -> markImagesIllegalIfNotInDb:
avoid accessing imagesInDbMap when null.

Change-Id: I75087440316cdc670552a25a9f2dd052b5573ed8
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/23179/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
index f1228c5..8de63e2 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java
@@ -96,7 +96,7 @@
         Map<Guid, DiskImage> imagesInDbMap = 
ImagesHandler.getDiskImagesByIdMap(imagesInDb);
         for (DiskImage fromConfigImg : vm.getImages()) {
             if (fromConfigImg.getDiskStorageType() == 
Disk.DiskStorageType.IMAGE
-                    && !imagesInDbMap.containsKey(fromConfigImg.getImageId())) 
{
+                    && imagesInDbMap != null && 
!imagesInDbMap.containsKey(fromConfigImg.getImageId())) {
                 log.debugFormat("Image {0} of Disk {1} cannot be found in 
database. This image will be returned as ILLEGAL from the query",
                         fromConfigImg.getImageId(),
                         fromConfigImg.getId());


-- 
To view, visit http://gerrit.ovirt.org/23179
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I75087440316cdc670552a25a9f2dd052b5573ed8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches