cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [3/4] git commit: updated refs/heads/4.4 to 0152763
Date Wed, 10 Sep 2014 11:59:33 GMT
CLOUDSTACK-6099 live migration is failing for vm deployed using dynaic compute offerings with
NPE

Signed-off-by: Rohit Yadav <rohit.yadav@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 <bharat.kumar@citrix.com>
Authored: Mon Sep 8 16:17:55 2014 +0530
Committer: Rohit Yadav <rohit.yadav@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);
 


Mime
View raw message