From aa8fc817906a50ab436fcb927879452ad6c2d04f Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Tue, 19 Jul 2011 11:54:32 -0700
Subject: [PATCH] Fix restartNetwork command on destroying virtual router

---
 .../src/com/cloud/network/element/VirtualRouterElement.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index d1bfa46e8b7..1b691d3f855 100644
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -145,7 +145,10 @@ public class VirtualRouterElement extends DhcpElement implements NetworkElement
         for (DomainRouterVO router : routers) {
             if (canHandle(network.getGuestType(), dest.getDataCenter())) {
                 host_id = router.getHostId();
-                _routerMgr.stopRouter(router.getId(), true);
+                if (_routerMgr.stopRouter(router.getId(), false) == null) {
+                    s_logger.warn("Failed to stop virtual router element " + router + " as a part of netowrk " + network + " restart");
+                    ret = false;
+                }
                 result = _routerMgr.destroyRouter(router.getId());
                 if (!result) {
                     s_logger.warn("Failed to destroy virtual router element " + router + " as a part of netowrk " + network + " restart");