cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/master to 4222364
Date Thu, 21 May 2015 05:28:04 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 19f3166a3 -> 4222364be


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/4222364b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4222364b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4222364b

Branch: refs/heads/master
Commit: 4222364beabb65ea09e7b32114070ab1afd13cd0
Parents: 19f3166
Author: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Authored: Thu May 21 10:40:59 2015 +0530
Committer: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Committed: Thu May 21 10:56:33 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/4222364b/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 a48db61..ad31fdd 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2358,7 +2358,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
             throw new CloudRuntimeException("Unable to find " + vmUuid);
         }
 
-        final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+        ServiceOfferingVO offeringVO = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
+        final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, offeringVO,
null, null);
 
         final Long hostId = vm.getHostId();
         if (hostId == null) {


Mime
View raw message