From 235e2d2df2c3dded72caa9121eae0db8a6b3f365 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 25 Apr 2022 10:01:16 +0200 Subject: [PATCH 1/2] remove superfluent counter and fix log message --- .../main/java/com/cloud/api/ApiSessionListener.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/server/src/main/java/com/cloud/api/ApiSessionListener.java b/server/src/main/java/com/cloud/api/ApiSessionListener.java index 6bb853d76c10..bb3a03f82a7e 100644 --- a/server/src/main/java/com/cloud/api/ApiSessionListener.java +++ b/server/src/main/java/com/cloud/api/ApiSessionListener.java @@ -33,17 +33,12 @@ public class ApiSessionListener implements HttpSessionListener, ServletRequestLi public static final Logger LOGGER = Logger.getLogger(ApiSessionListener.class.getName()); private static final String ATTRIBUTE_NAME = "SessionCounter"; private static Map sessions = new ConcurrentHashMap<>(); - private static long sessionCount; - - public ApiSessionListener() { - sessionCount = 0; - } /** * @return the internal adminstered session count */ public static long getSessionCount() { - return sessionCount; + return sessions.size(); } /** @@ -57,17 +52,15 @@ public void sessionCreated(HttpSessionEvent event) { synchronized (this) { HttpSession session = event.getSession(); sessions.put(session, event.getSource()); - sessionCount++; } - LOGGER.debug("Sessions count: " + sessions); + LOGGER.debug("Sessions count: " + sessions.size()); } public void sessionDestroyed(HttpSessionEvent event) { LOGGER.debug("Session destroyed by Id : " + event.getSession().getId() + " , session: " + event.getSession().toString() + " , source: " + event.getSource().toString() + " , event: " + event.toString()); synchronized (this) { - sessionCount--; sessions.remove(event.getSession()); } - LOGGER.debug("Sessions count: " + sessions); + LOGGER.debug("Sessions count: " + sessions.size()); } @Override From 9cb3fda099c02d1aa374e4a1762142334109822d Mon Sep 17 00:00:00 2001 From: dahn Date: Mon, 25 Apr 2022 13:08:17 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Pearl Dsilva --- server/src/main/java/com/cloud/api/ApiSessionListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/api/ApiSessionListener.java b/server/src/main/java/com/cloud/api/ApiSessionListener.java index bb3a03f82a7e..7f99bf596d69 100644 --- a/server/src/main/java/com/cloud/api/ApiSessionListener.java +++ b/server/src/main/java/com/cloud/api/ApiSessionListener.java @@ -53,14 +53,14 @@ public void sessionCreated(HttpSessionEvent event) { HttpSession session = event.getSession(); sessions.put(session, event.getSource()); } - LOGGER.debug("Sessions count: " + sessions.size()); + LOGGER.debug("Sessions count: " + getSessionCount()); } public void sessionDestroyed(HttpSessionEvent event) { LOGGER.debug("Session destroyed by Id : " + event.getSession().getId() + " , session: " + event.getSession().toString() + " , source: " + event.getSource().toString() + " , event: " + event.toString()); synchronized (this) { sessions.remove(event.getSession()); } - LOGGER.debug("Sessions count: " + sessions.size()); + LOGGER.debug("Sessions count: " + getSessionCount()); } @Override