From 2a6bef275068be80897b8dd4e4e22b93af45a0f3 Mon Sep 17 00:00:00 2001 From: kishan Date: Tue, 8 Feb 2011 12:34:04 +0530 Subject: [PATCH] seperating service API call form internal calls for revoke port forwarding rule --- server/src/com/cloud/network/rules/RulesManagerImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index db90e762be2..a12abb6b9aa 100644 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -355,6 +355,10 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager { @Override @ActionEvent (eventType=EventTypes.EVENT_NET_RULE_DELETE, eventDescription="revoking forwarding rule", async=true) public boolean revokePortForwardingRule(long ruleId, boolean apply) { + return revokePortForwardingRuleInternal(ruleId, apply); + } + + private boolean revokePortForwardingRuleInternal(long ruleId, boolean apply) { UserContext ctx = UserContext.current(); Account caller = ctx.getCaller(); @@ -396,7 +400,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager { } for (PortForwardingRuleVO rule : rules) { - revokePortForwardingRule(rule.getId(), true); + revokePortForwardingRuleInternal(rule.getId(), true); } return true; }