You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/09/10 13:26:16 UTC
git commit: updated refs/heads/4.3 to 57c69a8
Repository: cloudstack
Updated Branches:
refs/heads/4.3 885c02dbd -> 57c69a8ba
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/57c69a8b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/57c69a8b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/57c69a8b
Branch: refs/heads/4.3
Commit: 57c69a8ba02a9d327629fd8665262efc94813d3a
Parents: 885c02d
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:24:06 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/57c69a8b/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 8bd69f6..9a09ff1 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1786,7 +1786,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);