From a5004e37ad4609b98e5d5a78452e6fb8858f6504 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 17 Sep 2014 10:39:53 +0200 Subject: [PATCH] CID-1233084: Fix NPE in persisting volume in VolumeApiServiceImpl Signed-off-by: Rohit Yadav --- server/src/com/cloud/storage/VolumeApiServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index 16d46e654de..cf18555bfca 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -343,8 +343,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic volume.setDomainId((owner == null) ? Domain.ROOT_DOMAIN : owner.getDomainId()); if (diskOfferingId == null) { - long defaultDiskOfferingId = _diskOfferingDao.findByUniqueName("Cloud.com-Custom").getId(); - volume.setDiskOfferingId(defaultDiskOfferingId); + DiskOfferingVO diskOfferingVO = _diskOfferingDao.findByUniqueName("Cloud.com-Custom"); + if (diskOfferingVO != null) { + long defaultDiskOfferingId = diskOfferingVO.getId(); + volume.setDiskOfferingId(defaultDiskOfferingId); + } } else { volume.setDiskOfferingId(diskOfferingId); }