From 13c0478b9b953e2f9ffdf13e5e738e6721345c99 Mon Sep 17 00:00:00 2001 From: abhishek Date: Thu, 13 Jan 2011 14:53:48 -0800 Subject: [PATCH] bug 7933: this happens if you create a vm off of a so, and then delete that so. the so now ceases to exist, however, the host tries to calc stats using the so, which is null. fixing that issue. status 7933: resolved fixed --- server/src/com/cloud/server/ManagementServerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 12bcc34864d..5bdeca386c0 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -2876,7 +2876,7 @@ public class ManagementServerImpl implements ManagementServer { Long parentId = cmd.getParentDomainId(); Long ownerId = UserContext.current().getCaller().getId(); Account account = UserContext.current().getCaller(); - + if (ownerId == null) { ownerId = Long.valueOf(1); } @@ -3153,7 +3153,9 @@ public class ManagementServerImpl implements ManagementServer { List instances = _userVmDao.listUpByHostId(hostId); for (UserVmVO vm : instances) { ServiceOffering so = findServiceOfferingById(vm.getServiceOfferingId()); - mem += so.getRamSize() * 1024L * 1024L; + if (so != null) { + mem += so.getRamSize() * 1024L * 1024L; + } } return mem; }