cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/4.2 to ed08f0f
Date Fri, 02 Aug 2013 16:12:16 GMT
Updated Branches:
  refs/heads/4.2 0951739e3 -> ed08f0f55


CLOUDSTACK-4022: listProjects - do searchIncludingRemoved when getting info of corresponding
projectAccount because when the project is being removed, its account is marked as Removed
first, but we might still want to retrieve its info


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

Branch: refs/heads/4.2
Commit: ed08f0f55174d449238c0e3cac93e022097045ae
Parents: 0951739
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri Aug 2 09:01:27 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri Aug 2 09:04:05 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed08f0f5/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java
index 6c98f8c..616f256 100644
--- a/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java
@@ -91,7 +91,7 @@ public class ProjectJoinDaoImpl extends GenericDaoBase<ProjectJoinVO,
Long> impl
         }
         
         //set resource limit/count information for the project (by getting the info of the
project's account)
-        Account account = _accountDao.findById(proj.getProjectAccountId());
+        Account account = _accountDao.findByIdIncludingRemoved(proj.getProjectAccountId());
         AccountJoinVO accountJn = ApiDBUtils.newAccountView(account);
         _accountJoinDao.setResourceLimits(accountJn, false, response);
         


Mime
View raw message