From ff0a524bd689cc89f7ca48db84e6591edcd7c47c Mon Sep 17 00:00:00 2001
From: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Date: Wed, 12 Jun 2013 06:34:02 -0700
Subject: [PATCH] CLOUDSTACK-2969: Exception when creating vlan ip range

Description:

	Putting in null pointer check when creating ip range.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
---
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 111586d7733..b684e01ea0d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2528,7 +2528,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         }
         Transaction txn = Transaction.currentTxn();
         txn.start();
-        if (sameSubnet.first() == false) {
+        if (sameSubnet == null || sameSubnet.first() == false) {
             s_logger.info("adding a new subnet to the network "+network.getId());
         }
         else {