cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 3256e88
Date Thu, 29 May 2014 17:12:46 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master cdf4047ce -> 3256e8862


Allow usaage reporting on removed service offering

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

Branch: refs/heads/master
Commit: 3256e88623d62294af4eb9d22998fa5aadb1d06c
Parents: cdf4047
Author: Hiroki Ohashi <hiroki.soum@gmail.com>
Authored: Thu May 29 19:12:11 2014 +0200
Committer: Daan Hoogland <daan@onecht.net>
Committed: Thu May 29 19:12:11 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/3256e886/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 2a3c164..6927615 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3028,7 +3028,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         }
 
         if (usageRecord.getUsageType() == UsageTypes.RUNNING_VM || usageRecord.getUsageType()
== UsageTypes.ALLOCATED_VM) {
-            ServiceOfferingVO svcOffering = _entityMgr.findById(ServiceOfferingVO.class,
usageRecord.getOfferingId().toString());
+            ServiceOfferingVO svcOffering = _entityMgr.findByIdIncludingRemoved(ServiceOfferingVO.class,
usageRecord.getOfferingId().toString());
             //Service Offering Id
             usageRecResponse.setOfferingId(svcOffering.getUuid());
             //VM Instance ID


Mime
View raw message