From 0bbb8437cd8ac7bc7c27db4318c589edf8c2bb80 Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Thu, 27 Mar 2014 15:19:50 -0700
Subject: [PATCH] CLOUDSTACK-4506: fix NPE in case hostid is null

Conflicts:

	server/src/com/cloud/capacity/CapacityManagerImpl.java
---
 server/src/com/cloud/capacity/CapacityManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 69e8cfa169b..cef019ddff1 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -182,6 +182,10 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
     @DB
     @Override
     public boolean releaseVmCapacity(VirtualMachine vm, final boolean moveFromReserved, final boolean moveToReservered, final Long hostId) {
+        if (hostId == null) {
+            return true;
+        }
+
         final ServiceOfferingVO svo = _offeringsDao.findById(vm.getId(), vm.getServiceOfferingId());
         CapacityVO capacityCpu = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_CPU);
         CapacityVO capacityMemory = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_MEMORY);