Updated Branches: refs/heads/4.2 e65dbbc3c -> 37f99d8ac
CS-18685: do not modify vo, if you don't want to store it in db afterwards, as vo is cached by default. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/37f99d8a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/37f99d8a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/37f99d8a Branch: refs/heads/4.2 Commit: 37f99d8ac2bb5c19e033b28f4c1df7c5da57eeb9 Parents: e65dbbc Author: Edison Su <[email protected]> Authored: Thu Dec 19 10:49:24 2013 -0800 Committer: Edison Su <[email protected]> Committed: Thu Dec 19 10:49:24 2013 -0800 ---------------------------------------------------------------------- server/src/com/cloud/storage/VolumeManagerImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37f99d8a/server/src/com/cloud/storage/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java index 31b52ca..38392ba 100644 --- a/server/src/com/cloud/storage/VolumeManagerImpl.java +++ b/server/src/com/cloud/storage/VolumeManagerImpl.java @@ -651,12 +651,11 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { DiskOfferingVO diskOffering, List<StoragePool> avoids, long size, HypervisorType hyperType) { StoragePool pool = null; - + DiskProfile dskCh = null; if (diskOffering != null && diskOffering.isCustomized()) { - diskOffering.setDiskSize(size); + dskCh.setSize(size); } - DiskProfile dskCh = null; if (volume.getVolumeType() == Type.ROOT && Storage.ImageFormat.ISO != template.getFormat()) { dskCh = createDiskCharacteristics(volume, template, dc, offering);
