You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/07/06 08:30:05 UTC
[28/48] git commit: updated refs/heads/master to f1a6490
CLOUDSTACK-8491: Host maintenance fails if a vm on it is running a custom service offering VM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c21aa89a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c21aa89a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c21aa89a
Branch: refs/heads/master
Commit: c21aa89a47f4f8cf0bda12c7024fe30059004966
Parents: 258d9b1
Author: Abhinandan Prateek <ab...@shapeblue.com>
Authored: Thu May 21 10:40:59 2015 +0530
Committer: Abhinandan Prateek <ab...@shapeblue.com>
Committed: Thu May 21 10:40:59 2015 +0530
----------------------------------------------------------------------
.../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c21aa89a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 36c5c44..0abed38 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2347,7 +2347,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
throw new CloudRuntimeException("Unable to find " + vmUuid);
}
- VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+ ServiceOfferingVO offeringVO = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
+ VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, offeringVO, null, null);
Long hostId = vm.getHostId();
if (hostId == null) {