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/master to 4e53ce0
Date Fri, 02 Aug 2013 16:12:08 GMT
Updated Branches:
  refs/heads/master 80e2934bb -> 4e53ce067


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/4e53ce06
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e53ce06
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e53ce06

Branch: refs/heads/master
Commit: 4e53ce067722f4ef9e091455243459e8b151164b
Parents: 80e2934
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:03:57 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/4e53ce06/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