From b0712608782dcdcef092dc2234ac6ca1fe03b0ee Mon Sep 17 00:00:00 2001
From: Jason Bausewein <jason.bausewein@tier3.com>
Date: Mon, 2 Jul 2012 15:08:09 -0700
Subject: [PATCH] CS-15274: Fix NPE on CreateVlanIpRangeCmd()

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
---
 server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 86a047c407a..7f4256fe6b2 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2132,6 +2132,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
             if (network == null) {
                 if (zone.getNetworkType() == DataCenter.NetworkType.Basic) {
                     networkId = _networkMgr.getExclusiveGuestNetwork(zoneId).getId();
+                    network = _networkMgr.getNetwork(networkId);
                 } else {
                     network = _networkMgr.getNetworkWithSecurityGroupEnabled(zoneId);
                     if (network == null) {