From 3455a0f563d364cfb51816f0ba52461fef136ea8 Mon Sep 17 00:00:00 2001
From: nit <nitin@cloud.com>
Date: Tue, 9 Nov 2010 20:01:13 +0530
Subject: [PATCH] bug 7114: Fix NPE for  updateTemplatePermissions when
 accessed via 8096. This was happening due to accountObj being null in User
 Context when accessed via 8096. Why we set it to null seems to be a hack to
 me. status 7114: resolved fixed

---
 server/src/com/cloud/server/ManagementServerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index ae86023e978..2f2b5ab10c8 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -4012,7 +4012,8 @@ public class ManagementServerImpl implements ManagementServer {
         
         _templateDao.update(template.getId(), updatedTemplate);
 
-        Long domainId = account.getDomainId();
+        Long domainId;
+        domainId =  (null == account) ?  DomainVO.ROOT_DOMAIN : account.getDomainId(); // Account == null for 8096 and so its safe for domainid = ROOT
         if ("add".equalsIgnoreCase(operation)) {
             txn.start();
             for (String accountName : accountNames) {