Updated Branches: refs/heads/internallb 3795048fc -> 1db240c2b
InternalLb: fixed searchCriteria constructor in ApplicationLoadBalancerDaoImpl Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1db240c2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1db240c2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1db240c2 Branch: refs/heads/internallb Commit: 1db240c2b668e6cbbea4e09979c34d84fe54a624 Parents: 3795048 Author: Alena Prokharchyk <[email protected]> Authored: Thu Apr 11 14:23:55 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Thu Apr 11 14:23:55 2013 -0700 ---------------------------------------------------------------------- .../lb/dao/ApplicationLoadBalancerRuleDaoImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1db240c2/server/src/org/apache/cloudstack/network/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/network/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java b/server/src/org/apache/cloudstack/network/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java index a3d2ca9..6bf7868 100644 --- a/server/src/org/apache/cloudstack/network/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java +++ b/server/src/org/apache/cloudstack/network/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java @@ -63,9 +63,9 @@ public class ApplicationLoadBalancerRuleDaoImpl extends GenericDaoBase<Applicati CountBy.done(); NotRevokedSearch = createSearchBuilder(); - NotRevokedSearch.and("sourceIp", AllFieldsSearch.entity().getSourceIp(), SearchCriteria.Op.EQ); - NotRevokedSearch.and("sourceIpNetworkId", AllFieldsSearch.entity().getSourceIpNetworkId(), SearchCriteria.Op.EQ); - NotRevokedSearch.and("state", AllFieldsSearch.entity().getState(), SearchCriteria.Op.NEQ); + NotRevokedSearch.and("sourceIp", NotRevokedSearch.entity().getSourceIp(), SearchCriteria.Op.EQ); + NotRevokedSearch.and("sourceIpNetworkId", NotRevokedSearch.entity().getSourceIpNetworkId(), SearchCriteria.Op.EQ); + NotRevokedSearch.and("state", NotRevokedSearch.entity().getState(), SearchCriteria.Op.NEQ); NotRevokedSearch.done(); }
