Oved Ourfali has uploaded a new change for review.
Change subject: core: fix NPE in VdsUpdateRunTimeInfo
......................................................................
core: fix NPE in VdsUpdateRunTimeInfo
When a disk reported by VDSM doesn't exist in the engine, it causes NPE
when updating the disk statistics. Fixing it to check first if the
returned DB disk is null.
Change-Id: I9a3a02485766253fa63eb3260f60b83899bfd317
Signed-off-by: Oved Ourfali <oourf...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/18142/1
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
index 5a56b2e..6af8a28 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
@@ -1978,7 +1978,7 @@
Disk disk =
getDbFacade().getDiskDao().get(imageDynamic.getId());
// We have disk_id statistics, which is good, but
disk_image_dynamic table contains image_id, so we
// update for the AI.
- if (disk.getDiskStorageType() == DiskStorageType.IMAGE) {
+ if (disk != null && disk.getDiskStorageType() ==
DiskStorageType.IMAGE) {
DiskImage diskImage = (DiskImage) disk;
Guid activeImageId = diskImage.getImageId();
imageDynamic.setId(activeImageId);
--
To view, visit http://gerrit.ovirt.org/18142
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a3a02485766253fa63eb3260f60b83899bfd317
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Oved Ourfali <oourf...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
