added annotation and fixes

Abhinandan Prateek · Abhinandan Prateek · commit a6fac0d7687f · 2011-05-09T19:41:13.000+05:30
diff --git a/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java b/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java
@@ -25,6 +25,7 @@
 import org.apache.log4j.Logger;
 
 import com.cloud.network.FirewallRulesCidrsVO;
+import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
@@ -42,7 +43,7 @@ protected FirewallRulesCidrsDaoImpl() {
         CidrsSearch.done();        
     }
 
-    @Override
+    @Override @DB
     public List<String> getSourceCidrs(long firewallRuleId) {
         SearchCriteria sc = CidrsSearch.create();
         sc.setParameters("firewallRuleId", firewallRuleId);
@@ -56,7 +57,7 @@ public List<String> getSourceCidrs(long firewallRuleId) {
         return hostTags;
     }
     
-    @Override
+    @Override @DB
     public void persist(long firewallRuleId, List<String> sourceCidrs) {
         Transaction txn = Transaction.currentTxn();
 
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -288,7 +288,7 @@ public boolean deleteLoadBalancerRule(long loadBalancerId, boolean apply) {
     }
 
     @DB
-    private boolean deleteLoadBalancerRule(long loadBalancerId, boolean apply, Account caller, long callerUserId) {
+    public boolean deleteLoadBalancerRule(long loadBalancerId, boolean apply, Account caller, long callerUserId) {
         LoadBalancerVO lb = _lbDao.findById(loadBalancerId);
         Transaction txn = Transaction.currentTxn();
         boolean generateUsageEvent = false;

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ public boolean deleteLoadBalancerRule(long loadBalancerId, boolean apply) {`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`@DB`
`291`		`- private boolean deleteLoadBalancerRule(long loadBalancerId, boolean apply, Account caller, long callerUserId) {`
	`291`	`+ public boolean deleteLoadBalancerRule(long loadBalancerId, boolean apply, Account caller, long callerUserId) {`
`292`	`292`	`LoadBalancerVO lb = _lbDao.findById(loadBalancerId);`
`293`	`293`	`Transaction txn = Transaction.currentTxn();`
`294`	`294`	`boolean generateUsageEvent = false;`