Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52201E595 for ; Tue, 5 Feb 2013 18:07:01 +0000 (UTC) Received: (qmail 56423 invoked by uid 500); 5 Feb 2013 18:06:57 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 56312 invoked by uid 500); 5 Feb 2013 18:06:57 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 55954 invoked by uid 99); 5 Feb 2013 18:06:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 18:06:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1C82F82A5D4; Tue, 5 Feb 2013 18:06:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [41/51] [abbrv] git commit: refs/heads/vim51_win8 - CLOUDSTACK-1083: Include removed projects while listing usage records Message-Id: <20130205180657.1C82F82A5D4@tyr.zones.apache.org> Date: Tue, 5 Feb 2013 18:06:57 +0000 (UTC) CLOUDSTACK-1083: Include removed projects while listing usage records Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6b3da5fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6b3da5fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6b3da5fb Branch: refs/heads/vim51_win8 Commit: 6b3da5fbdc65b9a952cecbba393a06961f1ee088 Parents: ca56e76 Author: Kishan Kavala Authored: Mon Feb 4 19:24:22 2013 +0530 Committer: Kishan Kavala Committed: Mon Feb 4 19:29:59 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/api/commands/GetUsageRecordsCmd.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6b3da5fb/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java b/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java index 60afbd0..7f96b0c 100644 --- a/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java +++ b/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java @@ -236,7 +236,7 @@ public class GetUsageRecordsCmd extends BaseListCmd { Account account = ApiDBUtils.findAccountByIdIncludingRemoved(usageRecord.getAccountId()); if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) { //find the project - Project project = ApiDBUtils.findProjectByProjectAccountId(account.getId()); + Project project = ApiDBUtils.findProjectByProjectAccountIdIncludingRemoved(account.getId()); usageRecResponse.setProjectId(project.getUuid()); usageRecResponse.setProjectName(project.getName()); } else {