You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2014/02/13 10:07:26 UTC

git commit: updated refs/heads/4.3-forward to e8f93f2

Updated Branches:
  refs/heads/4.3-forward ed73e3e1b -> e8f93f28f


CLOUDSTACK-6083 corrected firewall rule cidr load issue


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8f93f28
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8f93f28
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8f93f28

Branch: refs/heads/4.3-forward
Commit: e8f93f28fc424c73156723d9b65b13c05dafc5a8
Parents: ed73e3e
Author: Jayapal <ja...@apache.org>
Authored: Thu Feb 13 14:24:42 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Thu Feb 13 14:24:42 2014 +0530

----------------------------------------------------------------------
 .../src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8f93f28/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java
index 52d5279..aa3b82e 100644
--- a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java
@@ -39,8 +39,7 @@ public class FirewallRulesCidrsDaoImpl extends GenericDaoBase<FirewallRulesCidrs
     protected FirewallRulesCidrsDaoImpl() {
         CidrsSearch = createSearchBuilder();
         CidrsSearch.and("firewallRuleId", CidrsSearch.entity().getFirewallRuleId(), SearchCriteria.Op.EQ);
-        CidrsSearch.and("firewallRuleId", CidrsSearch.entity().getId(), SearchCriteria.Op.EQ);
-        CidrsSearch.done();        
+        CidrsSearch.done();
     }
 
     @Override @DB