From d078f921671d0f28d9291fa2bffa8a7eab53cda7 Mon Sep 17 00:00:00 2001
From: Kishan Kavala <kishan@cloud.com>
Date: Thu, 16 May 2013 19:12:42 +0530
Subject: [PATCH] CLOUDSTACK-2544: Fix NPE while comparing lastHostId during
 capacity calculation

---
 server/src/com/cloud/capacity/CapacityManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index e7101c6755b..b2419893cf7 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -681,7 +681,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
 
         if ((newState == State.Starting || newState == State.Migrating || event == Event.AgentReportMigrated) && vm.getHostId() != null) {
             boolean fromLastHost = false;
-            if (vm.getLastHostId().equals(vm.getHostId())) {
+            if (vm.getHostId().equals(vm.getLastHostId())) {
                 s_logger.debug("VM starting again on the last host it was stopped on");
                 fromLastHost = true;
             }