From e6d6ccb72e0ba0147e18afdf0726f7d978e8e597 Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Tue, 21 Sep 2010 18:25:05 -0700
Subject: [PATCH] Retrieve the session parameters (userId, accountId, account)
 properly since UserContext is not the place to get those values.

---
 server/src/com/cloud/servlet/ConsoleProxyServlet.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index bae642ada82..7efde54e29d 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -31,7 +31,6 @@ import com.cloud.host.HostVO;
 import com.cloud.server.ManagementServer;
 import com.cloud.user.Account;
 import com.cloud.user.User;
-import com.cloud.user.UserContext;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
@@ -65,9 +64,13 @@ public class ConsoleProxyServlet extends HttpServlet {
             }
 
             // FIXME:  are these set up correctly from ApiServer?
-            Long userId = UserContext.current().getUserId();
-            String account = UserContext.current().getAccountName();
-            Account accountObj = (Account)UserContext.current().getAccountObject();
+            String userIdStr = (String)session.getAttribute("userid");
+            String account = (String)session.getAttribute("account");
+            Object accountObj = session.getAttribute("accountobj");
+            Long userId = null;
+            if (userIdStr != null) {
+                userId = Long.parseLong(userIdStr);
+            }
 
             // Do a sanity check here to make sure the user hasn't already been deleted
             if ((userId == null) || (account == null) || (accountObj == null) || !verifyUser(userId)) {