You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/09/10 13:59:33 UTC
[3/4] git commit: updated refs/heads/4.4 to 0152763
CLOUDSTACK-6099 live migration is failing for vm deployed using dynaic compute offerings with NPE
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/56c7fc80
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/56c7fc80
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/56c7fc80
Branch: refs/heads/4.4
Commit: 56c7fc800ad12e2e3ccbf7fc79aaacd709f036b2
Parents: bd8eaf8
Author: Bharat Kumar <bh...@citrix.com>
Authored: Mon Sep 8 16:17:55 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Sep 10 13:27:21 2014 +0200
----------------------------------------------------------------------
.../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56c7fc80/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 8a228ff..91af527 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1863,7 +1863,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
vmSrc.addNic(nic);
}
- VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+ VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);
_networkMgr.prepareNicForMigration(profile, dest);
volumeMgr.prepareForMigration(profile, dest);