apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5022: NullPointerException when invalid zone is passed into UsageEventUtils

Browse Source
This commit is contained in:
David Grizzanti 2013-12-03 11:45:27 -05:00 committed by Murali Reddy
parent 2d369dbdd8
commit 22422b9ddd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/components-api/src/com/cloud/event/UsageEventUtils.java
View File

@ -153,11 +153,16 @@ public class UsageEventUtils {
if (account == null) if (account == null)
return; return;
// if an invalid zone is passed in, create event without zone UUID
String zoneUuid = null;
if (dc != null)
zoneUuid = dc.getUuid();
Event event = new Event(Name, EventCategory.USAGE_EVENT.getName(), usageEventType, resourceType, resourceUUID); Event event = new Event(Name, EventCategory.USAGE_EVENT.getName(), usageEventType, resourceType, resourceUUID);
Map<String, String> eventDescription = new HashMap<String, String>(); Map<String, String> eventDescription = new HashMap<String, String>();
eventDescription.put("account", account.getUuid()); eventDescription.put("account", account.getUuid());
eventDescription.put("zone", dc.getUuid()); eventDescription.put("zone", zoneUuid);
eventDescription.put("event", usageEventType); eventDescription.put("event", usageEventType);
eventDescription.put("resource", resourceType); eventDescription.put("resource", resourceType);
eventDescription.put("id", resourceUUID); eventDescription.put("id", resourceUUID);