From ba9b041fe791c7fbe7e21fe151fce1fa4aa1d783 Mon Sep 17 00:00:00 2001
From: Anthony Xu <anthony.xu@citrix.com>
Date: Wed, 13 Nov 2013 17:48:34 -0800
Subject: [PATCH] fixed NPE

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

diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 39f0ca9e4b9..3cd07d06a7f 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -593,7 +593,9 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
 
         CapacityVO cpuCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_CPU);
         CapacityVO memCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_MEMORY);
-        memCap.setTotalCapacity(host.getTotalMemory());
+        if ( host.getTotalMemory() != null ) {
+            memCap.setTotalCapacity(host.getTotalMemory());
+        }
         if (cpuCap != null && memCap != null){
 
             long hostTotalCpu = host.getCpus().longValue() * host.getSpeed().longValue();