From e4092e808418dd533eee149b735c9f792c6f0a52 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Thu, 11 Aug 2011 17:42:50 -0700
Subject: [PATCH] do not release ip for advanced networking / regular LB usage

---
 .../com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
index 61b01f3d2a3..1631ac42caa 100644
--- a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
+++ b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
@@ -772,6 +772,9 @@ public class ElasticLoadBalancerManagerImpl implements
 
     @Override
     public void handleDeleteLoadBalancerRule(LoadBalancer lb, long userId, Account caller) {
+        if (!_enabled) {
+            return;
+        }
         List<LoadBalancerVO> remainingLbs = _loadBalancerDao.listByIpAddress(lb.getSourceIpAddressId());
         if (remainingLbs.size() == 0) {
             s_logger.debug("ELB mgr: releasing ip " + lb.getSourceIpAddressId() + " since  no LB rules remain for this ip address");