You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2014/07/30 13:03:35 UTC
git commit: updated refs/heads/master to 96b5c08
Repository: cloudstack
Updated Branches:
refs/heads/master fc14fe113 -> 96b5c0825
CLOUDSTACK-7136. While listing hosts for migration, the offering details were
not correctly initialized in the vmprofile. With a custom offering the cpu,
cpu-speed and memory were getting initialized to null which caused a NPE in
the allocator. Fixed it by explicitly initializing the offering details in the
vm profile before calling into the allocator for listing suitable hosts.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96b5c082
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96b5c082
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96b5c082
Branch: refs/heads/master
Commit: 96b5c08250984b50369eafe4a850fdad902ce70f
Parents: fc14fe1
Author: Devdeep Singh <de...@gmail.com>
Authored: Wed Jul 30 16:32:10 2014 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Wed Jul 30 16:32:10 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/server/ManagementServerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96b5c082/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 4dc6c19..2227c99 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1152,7 +1152,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
// Check if the vm is using any disks on local storage.
- VirtualMachineProfile vmProfile = new VirtualMachineProfileImpl(vm);
+ VirtualMachineProfile vmProfile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);
List<VolumeVO> volumes = _volumeDao.findCreatedByInstance(vmProfile.getId());
boolean usesLocal = false;
for (VolumeVO volume : volumes) {