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

Merging from 2.2Beta3 where network was not showing network dedicated to an user

This commit is contained in:
will 2010-12-31 00:51:44 -08:00
parent 18d4c97b55
commit fa7504532e
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -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<NetworkVO> 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<NetworkVO> networks = _networksDao.search(sc, searchFilter);