From bfa36c028049d2d3854d9c58a1fc9f9015e87a79 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 18 Sep 2014 11:26:20 +0200 Subject: [PATCH] CID-1233090, CID-1233089: Synchronize on session object in ApiServer Signed-off-by: Rohit Yadav --- server/src/com/cloud/api/ApiServer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index 43572307212..4b770fc7a91 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -937,13 +937,16 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer response.setTimeout(session.getMaxInactiveInterval()); final String user_UUID = (String)session.getAttribute("user_UUID"); - session.removeAttribute("user_UUID"); response.setUserId(user_UUID); final String domain_UUID = (String)session.getAttribute("domain_UUID"); - session.removeAttribute("domain_UUID"); response.setDomainId(domain_UUID); + synchronized (session) { + session.removeAttribute("user_UUID"); + session.removeAttribute("domain_UUID"); + } + final Enumeration attrNames = session.getAttributeNames(); if (attrNames != null) { while (attrNames.hasMoreElements()) {