From 91a87f9d8f34231dd7b580ed72ad7f0edef28acf Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Wed, 17 Nov 2010 21:42:51 -0800
Subject: [PATCH] bug 7155: fixed NPE in AuditTrial which used to happen when
 logout command was executed when session was already invalidated. status
 7155: resolved fixed

---
 server/src/com/cloud/api/ApiServlet.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index baf1e0fc44c..5620015508f 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -97,8 +97,12 @@ public class ApiServlet extends HttpServlet {
                     if (session != null) {  
                         Long userId = (Long)session.getAttribute("userid");
                         Account account = (Account)session.getAttribute("accountobj");
+                        Long accountId = null;
+                        if (account != null) {
+                            accountId = account.getId();
+                        }
                         auditTrailSb.insert(0, "(userId="+userId+ 
-                                " accountId="+ account==null ? null:account.getId()+ 
+                                " accountId="+ accountId + 
                                 " sessionId="+session.getId() +")" );
                         if (userId != null) {
                             _apiServer.logoutUser(userId);