Fix merge issues

This commit is contained in:
Chiradeep Vittal 2010-12-20 16:02:08 -08:00
parent 6da6330c3f
commit 64a831dd50
1 changed files with 8 additions and 0 deletions

View File

@ -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