Skip to content

Commit 0b77c88

Browse files
committed
Reduce access on user in SimpleBrokerMessageHandler.handleMessageInternal
Issue: SPR-16264
1 parent 28f1505 commit 0b77c88

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
@@ -251,7 +251,6 @@ protected void handleMessageInternal(Message<?> message) {
251251
SimpMessageType messageType = SimpMessageHeaderAccessor.getMessageType(headers);
252252
String destination = SimpMessageHeaderAccessor.getDestination(headers);
253253
String sessionId = SimpMessageHeaderAccessor.getSessionId(headers);
254-
Principal user = SimpMessageHeaderAccessor.getUser(headers);
255254

256255
updateSessionReadTime(sessionId);
257256

@@ -267,6 +266,7 @@ else if (SimpMessageType.CONNECT.equals(messageType)) {
267266
logMessage(message);
268267
long[] clientHeartbeat = SimpMessageHeaderAccessor.getHeartbeat(headers);
269268
long[] serverHeartbeat = getHeartbeatValue();
269+
Principal user = SimpMessageHeaderAccessor.getUser(headers);
270270
this.sessions.put(sessionId, new SessionInfo(sessionId, user, clientHeartbeat, serverHeartbeat));
271271
SimpMessageHeaderAccessor connectAck = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT_ACK);
272272
initHeaders(connectAck);
@@ -279,6 +279,7 @@ else if (SimpMessageType.CONNECT.equals(messageType)) {
279279
}
280280
else if (SimpMessageType.DISCONNECT.equals(messageType)) {
281281
logMessage(message);
282+
Principal user = SimpMessageHeaderAccessor.getUser(headers);
282283
handleDisconnect(sessionId, user, message);
283284
}
284285
else if (SimpMessageType.SUBSCRIBE.equals(messageType)) {

0 commit comments

Comments
 (0)