From f19fca6ec65b6dcf15800bafd31f8b158f86ef07 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Wed, 14 Sep 2011 02:58:44 -0700
Subject: [PATCH] Fix restartNetwork wrongly report stop failure

---
 server/src/com/cloud/network/element/VirtualRouterElement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index 1cd8034e2e2..02922d26105 100644
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -162,7 +162,7 @@ public class VirtualRouterElement extends DhcpElement implements NetworkElement,
             }
             if (cleanup) {
                 /* FIXME it's not completely safe to ignore these failure, but we would try to push on now */
-                if (router.getState() != State.Stopped || _routerMgr.stopRouter(router.getId(), false) == null) {
+                if (router.getState() != State.Stopped && _routerMgr.stopRouter(router.getId(), false) == null) {
                     s_logger.warn("Failed to stop virtual router element " + router + " as a part of network " + network + " restart");
                 }
                 if (_routerMgr.destroyRouter(router.getId()) == null) {