From 7ac3c818a97a7b8404ca85ae63bfa07352abf91e Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Fri, 12 Aug 2011 14:13:19 -0700
Subject: [PATCH] bug 11079: fixed a bug with autoboxing

---
 server/src/com/cloud/deploy/FirstFitPlanner.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index 405562f7e0b..0ffc13fe34c 100644
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -575,8 +575,8 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner {
                     if(!pool.isInMaintenance()){
                         if(!avoid.shouldAvoid(pool)){
                             long exstPoolDcId = pool.getDataCenterId();
-                            Long exstPoolPodId = pool.getPodId();
-                            Long exstPoolClusterId = pool.getClusterId();
+                            long exstPoolPodId = pool.getPodId() != null ? pool.getPodId() : -1;
+                            long exstPoolClusterId = pool.getClusterId() != null ? pool.getClusterId() : -1;
                             if(plan.getDataCenterId() == exstPoolDcId && plan.getPodId() == exstPoolPodId && plan.getClusterId() == exstPoolClusterId){
                                 s_logger.debug("Planner need not allocate a pool for this volume since its READY");
                                 suitablePools.add(pool);