From 8da874ca0b659dfda143f4e2a0e7dabcea809625 Mon Sep 17 00:00:00 2001 From: prachi Date: Fri, 18 Mar 2011 18:08:47 -0700 Subject: [PATCH] Fixed the NPE at RecreateHostAllocator found when a Pod with no cluster was present in the system. --- .../agent/manager/allocator/impl/RecreateHostAllocator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java index 56b8e9136ad..d6ac5a61b18 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java @@ -116,7 +116,7 @@ public class RecreateHostAllocator extends FirstFitRoutingAllocator { } for (PodCluster p : pcs) { - long clusterId = p.getCluster() == null ? null : p.getCluster().getId(); + Long clusterId = p.getCluster() == null ? null : p.getCluster().getId(); DataCenterDeployment newPlan = new DataCenterDeployment(plan.getDataCenterId(), p.getPod().getId(), clusterId, null); hosts = super.allocateTo(vm, newPlan, type, avoid, returnUpTo); if (hosts != null && !hosts.isEmpty()) {