From b1defdb71d977c85d5aa3f6226bfb9addce298e9 Mon Sep 17 00:00:00 2001 From: alena Date: Fri, 5 Nov 2010 17:42:16 -0700 Subject: [PATCH] bug 6895: fixed search by id in listDomains command status 6895: resolved fixed --- core/src/com/cloud/domain/dao/DomainDao.java | 2 -- server/src/com/cloud/server/ManagementServerImpl.java | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/src/com/cloud/domain/dao/DomainDao.java b/core/src/com/cloud/domain/dao/DomainDao.java index aba46e0a041..8671655d0f4 100644 --- a/core/src/com/cloud/domain/dao/DomainDao.java +++ b/core/src/com/cloud/domain/dao/DomainDao.java @@ -18,8 +18,6 @@ package com.cloud.domain.dao; -import java.util.List; - import com.cloud.domain.DomainVO; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index cae27f3c542..21073be9a92 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -4105,6 +4105,7 @@ public class ManagementServerImpl implements ManagementServer { Object keyword = cmd.getKeyword(); SearchBuilder sb = _domainDao.createSearchBuilder(); + sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE); sb.and("level", sb.entity().getLevel(), SearchCriteria.Op.EQ); sb.and("path", sb.entity().getPath(), SearchCriteria.Op.LIKE); @@ -4126,11 +4127,8 @@ public class ManagementServerImpl implements ManagementServer { sc.setParameters("level", level); } - if ((domainName == null) && (level == null) && (domainId != null)) { - DomainVO domain = _domainDao.findById(domainId); - if (domain != null) { - sc.setParameters("path", domain.getPath() + "%"); - } + if (domainId != null) { + sc.setParameters("id", domainId); } return _domainDao.search(sc, searchFilter);