[01/27] git commit: updated refs/heads/master to d4d5cab

[anthonyxu]

Repository: cloudstack
Updated Branches:
  refs/heads/master b6cc6dd8e -> d4d5cabb5


CLOUDSTACK-4506: fix NPE in case hostid is null

Conflicts:

        server/src/com/cloud/capacity/CapacityManagerImpl.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7416988c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7416988c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7416988c

Branch: refs/heads/master
Commit: 7416988c583261861398de1127b37d9a654ae4c7
Parents: b6cc6dd
Author: Edison Su <sudi...@gmail.com>
Authored: Thu Mar 27 15:19:50 2014 -0700
Committer: Anthony Xu <anthony...@citrix.com>
Committed: Fri Mar 28 16:14:46 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7416988c/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java 
b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 69e8cfa..cef019d 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);