You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/02/14 01:12:08 UTC

[6/7] git commit: updated refs/heads/4.3 to adf4dd5

CLOUDSTACK-6083 corrected firewall rule cidr load issue
(cherry picked from commit e8f93f28fc424c73156723d9b65b13c05dafc5a8)

Signed-off-by: Animesh Chaturvedi <an...@apache.org>


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

Branch: refs/heads/4.3
Commit: 88463cd10b3dae6af3168177355fd0ba92f87ecc
Parents: 0ff1522
Author: Jayapal <ja...@apache.org>
Authored: Thu Feb 13 14:24:42 2014 +0530
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Thu Feb 13 15:56:50 2014 -0800

----------------------------------------------------------------------
 .../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/88463cd1/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