From 0b77c8835c8d992ebd7efafb9b40b6b5d4335e13 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 19 Jan 2018 19:04:57 +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 ef3658302e2..5916e0ccf3c 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 @@ -251,7 +251,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); @@ -267,6 +266,7 @@ public class SimpleBrokerMessageHandler extends AbstractBrokerMessageHandler { logMessage(message); 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); @@ -279,6 +279,7 @@ public class SimpleBrokerMessageHandler extends AbstractBrokerMessageHandler { } else if (SimpMessageType.DISCONNECT.equals(messageType)) { logMessage(message); + Principal user = SimpMessageHeaderAccessor.getUser(headers); handleDisconnect(sessionId, user, message); } else if (SimpMessageType.SUBSCRIBE.equals(messageType)) {