From 47e26af4192c41f5ee105f6fff1d7c2ce28ad38b Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Tue, 19 Oct 2010 16:27:02 -0700
Subject: [PATCH] bug 6643:  when configuring vlan IP ranges, account might not
 be specified (zone wide IP range), so assign the configuration event to the
 SYSTEM account in those cases.

status 6643: resolved fixed
---
 .../com/cloud/configuration/ConfigurationManagerImpl.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index f43ee5cde45..1641dbc1c4d 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1504,8 +1504,9 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
 			eventMsg += ", end IP = " + endIP;
 		}
 		eventMsg += ".";
-		saveConfigurationEvent(userId, account.getId(), EventTypes.EVENT_VLAN_IP_RANGE_CREATE, eventMsg, "vlanType=" + vlanType, "dcId=" + zoneId,
-																												"accountId=" + account.getId(), "podId=" + podId,
+		Long accountId = ((account == null) ? Account.ACCOUNT_ID_SYSTEM : account.getId());
+		saveConfigurationEvent(userId, accountId, EventTypes.EVENT_VLAN_IP_RANGE_CREATE, eventMsg, "vlanType=" + vlanType, "dcId=" + zoneId,
+																												"accountId=" + accountId, "podId=" + podId,
 																												"vlanId=" + vlanId, "vlanGateway=" + vlanGateway,
 																												"vlanNetmask=" + vlanNetmask, "startIP=" + startIP,
 																												"endIP=" + endIP);