From 5960911511819658f3fb2be35c84ecb74bbccf61 Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Tue, 12 Oct 2010 19:42:53 -0700
Subject: [PATCH] Fix processing of session parameters in logout case

---
 server/src/com/cloud/api/ApiServlet.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index 10cc1a77c7b..0530c399da3 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -91,13 +91,13 @@ public class ApiServlet extends HttpServlet {
                 if ("logout".equalsIgnoreCase(command)) {
                     // if this is just a logout, invalidate the session and return
                     if (session != null) {  
-                        String userIdStr = (String)session.getAttribute("userid");
+                        Long userId = (Long)session.getAttribute("userid");
                         Account account = (Account)session.getAttribute("accountobj");
-                        auditTrailSb.insert(0, "(userId="+userIdStr+ 
+                        auditTrailSb.insert(0, "(userId="+userId+ 
                                 " accountId="+ account==null ? null:account.getId()+ 
                                 " sessionId="+session.getId() +")" );
-                        if (userIdStr != null) {
-                            _apiServer.logoutUser(Long.parseLong(userIdStr));
+                        if (userId != null) {
+                            _apiServer.logoutUser(userId);
                         }
                         session.invalidate();
                     }