etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing the zone creation bug

This commit is contained in:
abhishek 2010-11-04 09:47:22 -07:00
parent 7dc7a4838a
commit 137fe40c46
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -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