Skip to content

Commit f4e9fb5

Browse files
committed
Reduce access on user in SimpleBrokerMessageHandler.handleMessageInternal
Issue: SPR-16264
1 parent 04ab93c commit f4e9fb5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ protected void handleMessageInternal(Message<?> message) {
260260
SimpMessageType messageType = SimpMessageHeaderAccessor.getMessageType(headers);
261261
String destination = SimpMessageHeaderAccessor.getDestination(headers);
262262
String sessionId = SimpMessageHeaderAccessor.getSessionId(headers);
263-
Principal user = SimpMessageHeaderAccessor.getUser(headers);
264263

265264
updateSessionReadTime(sessionId);
266265

@@ -277,6 +276,7 @@ else if (SimpMessageType.CONNECT.equals(messageType)) {
277276
if (sessionId != null) {
278277
long[] clientHeartbeat = SimpMessageHeaderAccessor.getHeartbeat(headers);
279278
long[] serverHeartbeat = getHeartbeatValue();
279+
Principal user = SimpMessageHeaderAccessor.getUser(headers);
280280
this.sessions.put(sessionId, new SessionInfo(sessionId, user, clientHeartbeat, serverHeartbeat));
281281
SimpMessageHeaderAccessor connectAck = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT_ACK);
282282
initHeaders(connectAck);
@@ -293,6 +293,7 @@ else if (SimpMessageType.CONNECT.equals(messageType)) {
293293
else if (SimpMessageType.DISCONNECT.equals(messageType)) {
294294
logMessage(message);
295295
if (sessionId != null) {
296+
Principal user = SimpMessageHeaderAccessor.getUser(headers);
296297
handleDisconnect(sessionId, user, message);
297298
}
298299
}

0 commit comments

Comments
 (0)