From aa4ae7a750cfc4b024dcec3d411f7e8d083fbee7 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Fri, 8 Sep 2017 16:55:27 +0200
Subject: [PATCH] Heart-beat log message potentially without session id

Issue: SPR-15937
---
 .../messaging/simp/stomp/StompHeaderAccessor.java              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
index 9dc3800378..9d11893493 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
@@ -429,7 +429,8 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor {
 	@Override
 	public String getDetailedLogMessage(@Nullable Object payload) {
 		if (isHeartbeat()) {
-			return "heart-beat in session " + getSessionId();
+			String sessionId = getSessionId();
+			return "heart-beat" + (sessionId != null ? " in session " + sessionId : "");
 		}
 		StompCommand command = getCommand();
 		if (command == null) {