From f4e9fb52a87770763199ad37f5ef0257e68848dc Mon Sep 17 00:00:00 2001 From: Christoph Dreis Date: Tue, 5 Dec 2017 11:18:02 +0100 Subject: [PATCH] Reduce access on user in SimpleBrokerMessageHandler.handleMessageInternal Issue: SPR-16264 --- .../messaging/simp/broker/SimpleBrokerMessageHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java index 39d78aba89..21c2067d16 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java @@ -260,7 +260,6 @@ public class SimpleBrokerMessageHandler extends AbstractBrokerMessageHandler { SimpMessageType messageType = SimpMessageHeaderAccessor.getMessageType(headers); String destination = SimpMessageHeaderAccessor.getDestination(headers); String sessionId = SimpMessageHeaderAccessor.getSessionId(headers); - Principal user = SimpMessageHeaderAccessor.getUser(headers); updateSessionReadTime(sessionId); @@ -277,6 +276,7 @@ public class SimpleBrokerMessageHandler extends AbstractBrokerMessageHandler { if (sessionId != null) { long[] clientHeartbeat = SimpMessageHeaderAccessor.getHeartbeat(headers); long[] serverHeartbeat = getHeartbeatValue(); + Principal user = SimpMessageHeaderAccessor.getUser(headers); this.sessions.put(sessionId, new SessionInfo(sessionId, user, clientHeartbeat, serverHeartbeat)); SimpMessageHeaderAccessor connectAck = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT_ACK); initHeaders(connectAck); @@ -293,6 +293,7 @@ public class SimpleBrokerMessageHandler extends AbstractBrokerMessageHandler { else if (SimpMessageType.DISCONNECT.equals(messageType)) { logMessage(message); if (sessionId != null) { + Principal user = SimpMessageHeaderAccessor.getUser(headers); handleDisconnect(sessionId, user, message); } }