From 99556a4f30865081ee58825a37f52d8cedab185b Mon Sep 17 00:00:00 2001 From: Likitha Shetty Date: Wed, 12 Dec 2012 17:42:04 +0530 Subject: [PATCH] CLOUDSTACK-617: Unable to edit a sub-domain. Change UpdateDomain to be consistent with CreateDomain i.e. before this operation, while checking if the domain-name is unique, search under the parent domain instead of searching under the ROOT domain. Signed-off-by: Rohit Yadav --- server/src/com/cloud/server/ManagementServerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index a2a74c25a9a..40c55084ea9 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1513,10 +1513,11 @@ public class ManagementServerImpl implements ManagementServer { Account caller = UserContext.current().getCaller(); _accountMgr.checkAccess(caller, domain); - // domain name is unique in the cloud + // domain name is unique under the parent domain if (domainName != null) { SearchCriteria sc = _domainDao.createSearchCriteria(); sc.addAnd("name", SearchCriteria.Op.EQ, domainName); + sc.addAnd("parent", SearchCriteria.Op.EQ, domain.getParent()); List domains = _domainDao.search(sc, null); boolean sameDomain = (domains.size() == 1 && domains.get(0).getId() == domainId);