From 23674a53863fcb386d4cba5086e8b1c11ad4dd4b Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Fri, 12 Aug 2011 19:10:15 -0700
Subject: [PATCH] bug 11105: Fix router with disconnected host

We keep the stopped router there, but continue with the ones we can use.

status bug 11105: resolved fixed
---
 .../router/VirtualNetworkApplianceManagerImpl.java   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 531473a2014..acaeee0504c 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1053,14 +1053,10 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
         }
         
         for (DomainRouterVO router : routers) {
-            boolean skip = false;
-            if (router.getHostId() != null) {
-                HostVO host = _hostDao.findById(router.getHostId());
-                if (host == null || host.getStatus() != Status.Up) {
-                    skip = true;
-                }
-            }
-            if (!skip) {
+
+            HostVO host = _hostDao.findById(router.getHostId());
+            if (host != null && host.getStatus() == Status.Up) {
+
                 State state = router.getState();
                 if (state != State.Running) {
                     router = startVirtualRouter(router, _accountService.getSystemUser(), _accountService.getSystemAccount(), params);