From a06a07f48d3ae876f2555e2c483a39b0f1d52358 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 7 Dec 2010 19:17:38 -0800
Subject: [PATCH] Setup dhcp range in correct place

---
 .../network/router/DomainRouterManagerImpl.java   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java
index c998f48666f..d60261c2dd1 100644
--- a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java
+++ b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java
@@ -2201,15 +2201,14 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute
             } else if (nic.getTrafficType() == TrafficType.Control) {
                 controlNic = nic;
             }
-            
-            if (dhcpRange != null) {
-               buf.append(" dhcprange=" + dhcpRange);
-            }
-            if (domain != null) {
-                buf.append(" domain="+router.getDomain());
-            }
-            
         }
+        
+        if (dhcpRange != null) {
+            buf.append(" dhcprange=" + dhcpRange);
+         }
+         if (domain != null) {
+             buf.append(" domain="+router.getDomain());
+         }
   
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Boot Args for " + profile + ": " + buf.toString());