From 057e76c65be7626a463a2af43b11e8a6d0ea3a70 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Mon, 24 Jan 2011 12:39:52 +0530
Subject: [PATCH] use caller account Id for entity owner id for create pf rule

---
 .../cloud/api/commands/CreatePortForwardingRuleCmd.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
index 51fe94a76c0..8501b7c2147 100644
--- a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
+++ b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
@@ -31,6 +31,7 @@ import com.cloud.event.EventTypes;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.rules.PortForwardingRule;
+import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 import com.cloud.utils.net.Ip;
 
@@ -163,7 +164,13 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd  implements
 
     @Override
     public long getEntityOwnerId() {
-        return _entityMgr.findById(PortForwardingRule.class, getEntityId()).getAccountId();
+        Account account = UserContext.current().getCaller();
+
+        if (account != null) {
+            return account.getId();
+        }
+
+        return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
     }
 
     @Override