From d49776938b3dceca538caa0281ac78d9b3697619 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 1 Aug 2012 17:15:49 -0700
Subject: [PATCH] CS-15713 : remove listen section, when ld is removed

---
 .../cloud/network/HAProxyConfigurator.java    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java
index 1cd25b17e7a..7f6c713808a 100644
--- a/core/src/com/cloud/network/HAProxyConfigurator.java
+++ b/core/src/com/cloud/network/HAProxyConfigurator.java
@@ -573,20 +573,22 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
 
         }
         result.add(getBlankLine());
-
-        if (lbCmd.getLoadBalancers().length == 0) {
+        boolean has_listener = false;
+        for (LoadBalancerTO lbTO : lbCmd.getLoadBalancers()) {
+            if ( lbTO.isRevoked() ) {
+                continue;
+            }
+            List<String> poolRules = getRulesForPool(lbTO);
+            result.addAll(poolRules);
+            has_listener = true;
+        }
+        result.add(getBlankLine());
+        if ( !has_listener) {
             // haproxy cannot handle empty listen / frontend or backend, so add
             // a dummy listener
             // on port 9
             result.addAll(Arrays.asList(defaultListen));
         }
-        result.add(getBlankLine());
-
-        for (LoadBalancerTO lbTO : lbCmd.getLoadBalancers()) {
-            List<String> poolRules = getRulesForPool(lbTO);
-            result.addAll(poolRules);
-        }
-
         return result.toArray(new String[result.size()]);
     }