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

bug 12329: use diff field name in listIps search 

status 12329: resolved fixed
This commit is contained in:
Alena Prokharchyk 2011-12-04 10:13:01 -08:00
parent 50a1bfed06
commit 3acf49daa5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -1885,7 +1885,7 @@ public class ManagementServerImpl implements ManagementServer {
sb.and("vlanDbId", sb.entity().getVlanId(), SearchCriteria.Op.EQ);
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("physicalNetworkId", sb.entity().getPhysicalNetworkId(), SearchCriteria.Op.EQ);
sb.and("associatedNetworkId", sb.entity().getAssociatedWithNetworkId(), SearchCriteria.Op.EQ);
sb.and("associatedNetworkIdEq", sb.entity().getAssociatedWithNetworkId(), SearchCriteria.Op.EQ);
if ((permittedAccounts.isEmpty()) && (domainId != null)) {
// if accountId isn't specified, we can do a domain match for the admin case
@ -1961,7 +1961,7 @@ public class ManagementServerImpl implements ManagementServer {
}
if (associatedNetworkId != null) {
sc.setParameters("associatedNetworkId", associatedNetworkId);
sc.setParameters("associatedNetworkIdEq", associatedNetworkId);
}
return _publicIpAddressDao.search(sc, searchFilter);