diff --git a/engine/components-api/src/com/cloud/event/UsageEventUtils.java b/engine/components-api/src/com/cloud/event/UsageEventUtils.java index e71afb015db..90a2f17f1b8 100644 --- a/engine/components-api/src/com/cloud/event/UsageEventUtils.java +++ b/engine/components-api/src/com/cloud/event/UsageEventUtils.java @@ -153,11 +153,16 @@ public class UsageEventUtils { if (account == null) 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); Map eventDescription = new HashMap(); eventDescription.put("account", account.getUuid()); - eventDescription.put("zone", dc.getUuid()); + eventDescription.put("zone", zoneUuid); eventDescription.put("event", usageEventType); eventDescription.put("resource", resourceType); eventDescription.put("id", resourceUUID);