From 01d50e9bde8a1da5e8e869d1287cef6a97907a38 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Mon, 4 Apr 2016 13:57:50 -0400
Subject: [PATCH] Fix incomplete log message

Commit 48236b from 2014 introduced a logging improvement to avoid
logging each removed session per line and instead log one line at
the end with all removed sessions ids. However that list of removed
session ids wasn't populated. This commit fixes that.

Issue: SPR-14111
---
 .../sockjs/transport/TransportHandlingSockJsService.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
index 81d10a0b85a..10f40141c53 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
@@ -359,14 +359,15 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem
 			if (this.sessionCleanupTask != null) {
 				return;
 			}
-			final List<String> removedSessionIds = new ArrayList<String>();
 			this.sessionCleanupTask = getTaskScheduler().scheduleAtFixedRate(new Runnable() {
 				@Override
 				public void run() {
+					List<String> removedIds = new ArrayList<String>();
 					for (SockJsSession session : sessions.values()) {
 						try {
 							if (session.getTimeSinceLastActive() > getDisconnectDelay()) {
 								sessions.remove(session.getId());
+								removedIds.add(session.getId());
 								session.close();
 							}
 						}
@@ -375,9 +376,8 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem
 							logger.debug("Failed to close " + session, ex);
 						}
 					}
-					if (logger.isDebugEnabled() && !removedSessionIds.isEmpty()) {
-						logger.debug("Closed " + removedSessionIds.size() + " sessions " + removedSessionIds);
-						removedSessionIds.clear();
+					if (logger.isDebugEnabled() && !removedIds.isEmpty()) {
+						logger.debug("Closed " + removedIds.size() + " sessions: " + removedIds);
 					}
 				}
 			}, getDisconnectDelay());