You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2013/11/03 20:44:36 UTC
git commit: updated refs/heads/4.2 to d6420cd
Updated Branches:
refs/heads/4.2 89206094a -> d6420cd91
CLOUDSTACK-5023: Deleting Port Forwarding Rule fails when generating usage events are enabled
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d6420cd9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6420cd9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6420cd9
Branch: refs/heads/4.2
Commit: d6420cd91ebb493e8b9d4220e95b7a3250272db3
Parents: 8920609
Author: David Grizzanti <dg...@gmail.com>
Authored: Fri Nov 1 11:40:32 2013 -0400
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Nov 3 20:43:13 2013 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/firewall/FirewallManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6420cd9/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index 8c4583e..e9811d6 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -738,7 +738,8 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
}
if (generateUsageEvent && needUsageEvent) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_RULE_DELETE, rule.getAccountId(), 0, rule.getId(),
+ Network network = _networkModel.getNetwork(rule.getNetworkId());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_RULE_DELETE, rule.getAccountId(), network.getDataCenterId(), rule.getId(),
null, rule.getClass().getName(), rule.getUuid());
}