From 64a831dd503980295be4dc472b200ee9d9b0c59e Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Mon, 20 Dec 2010 16:02:08 -0800
Subject: [PATCH] Fix merge issues

---
 .../com/cloud/network/router/DomainRouterManagerImpl.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java
index 36cc2e8795f..f60e0f14405 100644
--- a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java
+++ b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java
@@ -2132,6 +2132,14 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute
             //Send commands to router
             return sendCommandsToRouter(router, cmds);   
 
+        } else if (router.getState() == State.Stopped || router.getState() == State.Stopping){
+            s_logger.debug("Router is in " + router.getState() + ", so not sending apply LB rules commands to the backend");
+            return true;
+        } else {
+            s_logger.warn("Unable to apply load balancer rules, virtual router is not in the right state " + router.getState());
+            throw new ResourceUnavailableException("Unable to apply load balancer rules, domR is not in right state " + router.getState());
+        }
+
     }
     
     @Override