CLOUDSTACK-1551: Failed to list clusters due to NPE at createClusterResponse(ApiResponseHelper.java:837) when cluster is added automatically as a part of addHostCommand
Signed-off-by: Abhinandan Prateek <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6715f980 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6715f980 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6715f980 Branch: refs/heads/ui-multiple-nics Commit: 6715f98087541440f1737912f15d9e3408793834 Parents: 27b753a Author: Bharat Kumar <[email protected]> Authored: Fri Mar 8 15:08:41 2013 +0530 Committer: Abhinandan Prateek <[email protected]> Committed: Wed Mar 13 11:07:28 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/resource/ResourceManagerImpl.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6715f980/server/src/com/cloud/resource/ResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 47b1d55..15d32e0 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -770,6 +770,13 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } } clusterId = cluster.getId(); + if (_clusterDetailsDao.findDetail(clusterId,"cpuOvercommitRatio") == null) { + ClusterDetailsVO cluster_cpu_detail = new ClusterDetailsVO(clusterId,"cpuOvercommitRatio","1"); + ClusterDetailsVO cluster_memory_detail = new ClusterDetailsVO(clusterId,"memoryOvercommitRatio","1"); + _clusterDetailsDao.persist(cluster_cpu_detail); + _clusterDetailsDao.persist(cluster_memory_detail); + } + } try {
