From 03ba659ae7263ca4fdb7c1c0eaccbecdf45594e8 Mon Sep 17 00:00:00 2001
From: David Grizzanti <dgrizzanti@gmail.com>
Date: Wed, 20 Nov 2013 14:35:30 -0500
Subject: [PATCH] CLOUDSTACK-5022: NullPointerException when invalid zone is
 passed into UsageEventUtils

---
 server/src/com/cloud/event/UsageEventUtils.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/event/UsageEventUtils.java b/server/src/com/cloud/event/UsageEventUtils.java
index 2e422297093..6cb0f63d2b5 100644
--- a/server/src/com/cloud/event/UsageEventUtils.java
+++ b/server/src/com/cloud/event/UsageEventUtils.java
@@ -139,12 +139,17 @@ 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(ManagementServer.Name, EventCategory.USAGE_EVENT.getName(), usageEventType,
                 resourceType, resourceUUID);
 
         Map<String, String> eventDescription = new HashMap<String, String>();
         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);