From 974245991c4c3fe51e63fe18b19853f5f8a0c6fa Mon Sep 17 00:00:00 2001
From: Bharat Kumar <bharat.kumar@citrix.com>
Date: Thu, 27 Jun 2013 19:12:20 +0530
Subject: [PATCH] Cloudstack-2732 [Multiple_IP_Ranges] Deleting guest IP range
 is not throwing any error message to user while the ip addresses are being
 used

Signed-off-by: Jayapal <jayapal@apache.org>
---
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 51c323dad80..3840c120630 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3267,6 +3267,10 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
             }
             else {
                 ipAlias = _nicIpAliasDao.findByGatewayAndNetworkIdAndState(vlanRange.getVlanGateway(), vlanRange.getNetworkId(),  NicIpAlias.state.active);
+                if (ipAlias == null) {
+                    throw  new InvalidParameterValueException ("Cannot delete this range as some of the Ips are in use.");
+                }
+
                 //check if this ip belongs to this vlan and is allocated.
                 ip = _publicIpAddressDao.findByIpAndVlanId(ipAlias.getIp4Address(), vlanDbId);
                 if (ip != null && ip.getState() == IpAddress.State.Allocated) {