cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/4.2 to e2e3b9a
Date Tue, 23 Jul 2013 14:55:53 GMT
Updated Branches:
  refs/heads/4.2 79209c133 -> e2e3b9a28


CLOUDSTACK-3727: Resource Count calculation happens for deleted accounts on restart of managment
server.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit a7084b2dac594a5851e32be692863fb9f7b23d9d)


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

Branch: refs/heads/4.2
Commit: e2e3b9a2884d4f1029aa5e0bb5137160fd794b24
Parents: 79209c1
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Tue Jul 23 18:15:07 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue Jul 23 20:25:41 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/server/ConfigurationServerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2e3b9a2/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 9a9b145..febb6d2 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -1299,8 +1299,8 @@ public class ConfigurationServerImpl extends ManagerBase implements
Configuratio
     @DB
     public void updateResourceCount() {
         ResourceType[] resourceTypes = Resource.ResourceType.values();
-        List<AccountVO> accounts = _accountDao.listAllIncludingRemoved();
-        List<DomainVO> domains = _domainDao.listAllIncludingRemoved();
+        List<AccountVO> accounts = _accountDao.listAll();
+        List<DomainVO> domains = _domainDao.listAll();
         List<ResourceCountVO> domainResourceCount = _resourceCountDao.listResourceCountByOwnerType(ResourceOwnerType.Domain);
         List<ResourceCountVO> accountResourceCount = _resourceCountDao.listResourceCountByOwnerType(ResourceOwnerType.Account);
 


Mime
View raw message