cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 9eae5f6
Date Tue, 28 Jan 2014 12:57:14 GMT
Updated Branches:
  refs/heads/master 95bd04e44 -> 9eae5f692


findbugs: nullpointer dereference guarded(cherry picked from commit
43ba36f97950aa8d09399a28bb50c6a22209f15e)


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

Branch: refs/heads/master
Commit: 4f6638d7c7436cd638c653d0e08e6fa2023420e8
Parents: 997c0f8
Author: Daan Hoogland <daan@onecht.net>
Authored: Tue Jan 28 13:49:14 2014 +0100
Committer: Daan Hoogland <dhoogland@schubergphilis.com>
Committed: Tue Jan 28 13:49:14 2014 +0100

----------------------------------------------------------------------
 .../impl/UserConcentratedAllocator.java         | 47 ++++++++++----------
 1 file changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f6638d7/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
index b67eccb..946eee6 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
@@ -243,35 +243,36 @@ public class UserConcentratedAllocator extends AdapterBase implements
PodAllocat
         // List<VMInstanceVO> vms = _vmInstanceDao.listByLastHostId(hostId);
         List<VMInstanceVO> vms = null;
         long usedCapacity = 0;
-        for (VMInstanceVO vm : vms) {
-            if (skipCalculation(vm)) {
-                continue;
-            }
-
-            ServiceOffering so = null;
-
-            if (vm.getType() == VirtualMachine.Type.User) {
-                UserVmVO userVm = _vmDao.findById(vm.getId());
-                if (userVm == null) {
+        if (vms != null) {
+            for (VMInstanceVO vm : vms) {
+                if (skipCalculation(vm)) {
                     continue;
                 }
-            }
 
-            so = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
+                ServiceOffering so = null;
 
-            if (capacityType == Capacity.CAPACITY_TYPE_MEMORY) {
-                usedCapacity += so.getRamSize() * 1024L * 1024L;
-
-                if (s_logger.isDebugEnabled()) {
-                    s_logger.debug("Counting memory capacity used by vm: " + vm.getId() +
", size: " + so.getRamSize() + "MB, host: " + hostId + ", currently counted: " +
-                        usedCapacity + " Bytes");
+                if (vm.getType() == VirtualMachine.Type.User) {
+                    UserVmVO userVm = _vmDao.findById(vm.getId());
+                    if (userVm == null) {
+                        continue;
+                    }
                 }
-            } else if (capacityType == Capacity.CAPACITY_TYPE_CPU) {
-                usedCapacity += so.getCpu() * so.getSpeed();
 
-                if (s_logger.isDebugEnabled()) {
-                    s_logger.debug("Counting cpu capacity used by vm: " + vm.getId() + ",
cpu: " + so.getCpu() + ", speed: " + so.getSpeed() + ", currently counted: " +
-                        usedCapacity + " Bytes");
+                so = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
+                if (capacityType == Capacity.CAPACITY_TYPE_MEMORY) {
+                    usedCapacity += so.getRamSize() * 1024L * 1024L;
+
+                    if (s_logger.isDebugEnabled()) {
+                        s_logger.debug("Counting memory capacity used by vm: " + vm.getId()
+ ", size: " + so.getRamSize() + "MB, host: " + hostId + ", currently counted: " +
+                                usedCapacity + " Bytes");
+                    }
+                } else if (capacityType == Capacity.CAPACITY_TYPE_CPU) {
+                    usedCapacity += so.getCpu() * so.getSpeed();
+
+                    if (s_logger.isDebugEnabled()) {
+                        s_logger.debug("Counting cpu capacity used by vm: " + vm.getId()
+ ", cpu: " + so.getCpu() + ", speed: " + so.getSpeed() + ", currently counted: " +
+                                usedCapacity + " Bytes");
+                    }
                 }
             }
         }


Mime
View raw message