From 3acf49daa530900db4810f9c86f1aed1f9556e1f Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Sun, 4 Dec 2011 10:13:01 -0800 Subject: [PATCH] bug 12329: use diff field name in listIps search status 12329: resolved fixed --- server/src/com/cloud/server/ManagementServerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index f55511e4812..64b1ec86f23 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -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);