From 1fadde2082c778b68f918cacd015bdb0028009f2 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 16 Nov 2011 15:07:24 -0800 Subject: [PATCH] Fixed bug in list domain level networks --- .../com/cloud/network/NetworkManagerImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 405186414be..815bd03045a 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2286,12 +2286,16 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag } } - SearchCriteria domainSC = _networksDao.createSearchCriteria(); - domainSC.addAnd("id", SearchCriteria.Op.IN, networkIds.toArray()); - domainSC.addAnd("aclType", SearchCriteria.Op.EQ, ACLType.Domain.toString()); - - sc.addAnd("id", SearchCriteria.Op.SC, domainSC); - return _networksDao.search(sc, searchFilter); + if (!networkIds.isEmpty()) { + SearchCriteria domainSC = _networksDao.createSearchCriteria(); + domainSC.addAnd("id", SearchCriteria.Op.IN, networkIds.toArray()); + domainSC.addAnd("aclType", SearchCriteria.Op.EQ, ACLType.Domain.toString()); + + sc.addAnd("id", SearchCriteria.Op.SC, domainSC); + return _networksDao.search(sc, searchFilter); + } else { + return new ArrayList(); + } } private List listAccountSpecificNetworks(SearchCriteria sc, Filter searchFilter, List permittedAccounts) {