You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/05/29 09:49:01 UTC
git commit: updated refs/heads/4.3 to 24e03be
Repository: cloudstack
Updated Branches:
refs/heads/4.3 c0cf817f1 -> 24e03bed5
Fix usage response, patch by Hiroki Ohashi
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24e03bed
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24e03bed
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24e03bed
Branch: refs/heads/4.3
Commit: 24e03bed560feb959a61126b76c2d6971e77092e
Parents: c0cf817
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Thu May 29 09:48:46 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Thu May 29 09:48:46 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/api/ApiResponseHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24e03bed/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 7718fc1..cbf3914 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3304,7 +3304,7 @@ public class ApiResponseHelper implements ResponseGenerator {
usageRecResponse.setUsage(usageRecord.getUsageDisplay());
usageRecResponse.setUsageType(usageRecord.getUsageType());
if (usageRecord.getVmInstanceId() != null) {
- VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, usageRecord.getVmInstanceId());
+ VMInstanceVO vm = _entityMgr.findByIdIncludingRemoved(VMInstanceVO.class, usageRecord.getVmInstanceId());
if (vm != null) {
usageRecResponse.setVirtualMachineId(vm.getUuid());
}