Repository: cloudstack Updated Branches: refs/heads/4.4 c4b78c3aa -> 260e694e8
bugfix CLOUDSTACK-7309 using findProjectByProjectAccountIdIncludingRemoved Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/260e694e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/260e694e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/260e694e Branch: refs/heads/4.4 Commit: 260e694e89cdf15d224ea3b137987e8a44549a18 Parents: c4b78c3 Author: Luis Henrique Okama <lok...@gmail.com> Authored: Tue Aug 12 13:29:32 2014 -0300 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Wed Aug 13 00:06:17 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/api/ApiResponseHelper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/260e694e/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index c07d454..37cb155 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -3261,9 +3261,11 @@ public class ApiResponseHelper implements ResponseGenerator { Account account = ApiDBUtils.findAccountById(usageRecord.getAccountId()); if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) { //find the project - Project project = ApiDBUtils.findProjectByProjectAccountId(account.getId()); - usageRecResponse.setProjectId(project.getUuid()); - usageRecResponse.setProjectName(project.getName()); + Project project = ApiDBUtils.findProjectByProjectAccountIdIncludingRemoved(account.getId()); + if (project != null) { + usageRecResponse.setProjectId(project.getUuid()); + usageRecResponse.setProjectName(project.getName()); + } } else { usageRecResponse.setAccountId(account.getUuid()); usageRecResponse.setAccountName(account.getAccountName());
