From fa7504532eee9c8f0e14ccc4cc83d9dbdc7753cf Mon Sep 17 00:00:00 2001 From: will Date: Fri, 31 Dec 2010 00:51:44 -0800 Subject: [PATCH] Merging from 2.2Beta3 where network was not showing network dedicated to an user --- server/src/com/cloud/network/NetworkManagerImpl.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 19b1cf85238..05bcb5470a6 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1555,14 +1555,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag if (account.getType() != Account.ACCOUNT_TYPE_ADMIN || (accountName != null && domainId != null)) { sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId); } - - SearchCriteria ssc = _networksDao.createSearchCriteria(); - /* ssc.addOr("accountId", SearchCriteria.Op.EQ, accountId); - if (accountName == null && domainId == null) { - ssc.addOr("accountId", SearchCriteria.Op.EQ, 1L); - } - sc.addAnd("accountId", SearchCriteria.Op.SC, ssc); - }*/ List networks = _networksDao.search(sc, searchFilter);