cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to 2b7b837
Date Wed, 10 Sep 2014 11:26:46 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 70142c4ac -> 2b7b837b2


CLOUDSTACK-6099 live migration is failing for vm deployed using dynaic compute offerings with
NPE


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b7b837b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b7b837b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b7b837b

Branch: refs/heads/master
Commit: 2b7b837b28f847eedf3cd7bd034dc23ba43d8a63
Parents: 70142c4
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:26:24 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/2b7b837b/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 8edef77..0e12bcb 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1843,7 +1843,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