From e18ca0117d76cc6b095659e4e354ab977174b96c Mon Sep 17 00:00:00 2001 From: Vijayendra Bhamidipati Date: Mon, 15 Jul 2013 11:54:34 -0700 Subject: [PATCH] CLOUDSTACK-3514: [Automation] Vmware - Failed to download default template for first zone Description: Fixing reference to null object. --- .../src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index b5c060d8c33..a721510757a 100755 --- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -811,7 +811,9 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim _resourceCountDao.lockRows(sc, null, true); ResourceCountVO accountRC = _resourceCountDao.findByOwnerAndType(accountId, ResourceOwnerType.Account, type); - long oldCount = accountRC.getCount(); + long oldCount = 0; + if (accountRC != null) + oldCount = accountRC.getCount(); if (type == Resource.ResourceType.user_vm) { newCount = _userVmDao.countAllocatedVMsForAccount(accountId);