From 137fe40c466ec2c6f88c756886bb9cb260933382 Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Thu, 4 Nov 2010 09:47:22 -0700
Subject: [PATCH] fixing the zone creation bug

---
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index bdca16e0c28..5c1c25328cb 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1021,7 +1021,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
         String internalDns2 = cmd.getInternalDns2();
         String vnetRange = cmd.getVlan();
         String guestCidr = cmd.getGuestCidrAddress();
-        String domain = cmd.getDomain();
+        String domain = cmd.getDomain();//we are not passing domain right now, always null
         Long domainId = cmd.getDomainId();
         DomainVO domainVO = null;
         
@@ -1032,7 +1032,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
         if(domainId != null){
         	domainVO = _domainDao.findById(domainId); 
         }
-        return createZone(userId, zoneName, dns1, dns2, internalDns1, internalDns2, vnetRange, guestCidr, domain != null ? domain : domainVO.getName(), domainId);
+        return createZone(userId, zoneName, dns1, dns2, internalDns1, internalDns2, vnetRange, guestCidr, domainVO != null ? domainVO.getName() : null, domainId);
     }
 
     @Override