From 0e032c5301af734a4990880e8f541679ee310c5d Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 1 Mar 2011 10:17:55 -0800
Subject: [PATCH] Fixed NPE in createVlanIpRange

---
 .../configuration/ConfigurationManagerImpl.java      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index c6f7415443a..04a130c0029 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1619,13 +1619,15 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
         }
         
         //if vlan is specified, throw an error if it's not equal to network's vlanId
-        URI uri = network.getBroadcastUri();
-        if (uri != null) {
-            String[] vlan = uri.toString().split("vlan:\\/\\/");
-            networkVlanId = vlan[1];
+        if (network != null) {
+            URI uri = network.getBroadcastUri();
+            if (uri != null) {
+                String[] vlan = uri.toString().split("vlan:\\/\\/");
+                networkVlanId = vlan[1];
+            }
         }
         
-        if (vlanId != null && !networkVlanId.equalsIgnoreCase(vlanId)) {
+        if (vlanId != null && networkVlanId != null && !networkVlanId.equalsIgnoreCase(vlanId)) {
             throw new InvalidParameterValueException("Vlan doesn't match vlan of the network");
         }