From de6a3112b6b80952d1598acaa112ac50a3ef9d32 Mon Sep 17 00:00:00 2001 From: Mike Tutkowski Date: Thu, 28 Aug 2014 23:19:04 -0600 Subject: [PATCH] Update to volume-resize logic --- server/src/com/cloud/storage/VolumeApiServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index 0c7c6e565f3..c6621656f36 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -710,7 +710,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic _accountMgr.checkAccess(CallContext.current().getCallingAccount(), null, true, volume); DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); - DiskOfferingVO newDiskOffering = _diskOfferingDao.findById(cmd.getNewDiskOfferingId()); + DiskOfferingVO newDiskOffering = null; + + if (cmd.getNewDiskOfferingId() != null && volume.getDiskOfferingId() != cmd.getNewDiskOfferingId()) { + newDiskOffering = _diskOfferingDao.findById(cmd.getNewDiskOfferingId()); + } /* Only works for KVM/XenServer/VMware (or "Any") for now, and volumes with 'None' since they're just allocated in DB */