From d1721669ea84bc7bf2857e793d9c4b77db321ca4 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Sat, 13 Aug 2011 00:08:21 -0700
Subject: [PATCH] bug 11122: Fix router startup

The new created router got hostId = 0.

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

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