From 07a0a3156559c3d838249b7aa923abe1d9ee1f83 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
(cherry picked from commit aa4ae7a)
---
 .../messaging/simp/stomp/StompHeaderAccessor.java            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 d38f8906ba..44524afa3f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -416,7 +416,8 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor {
 	@Override
 	public String getDetailedLogMessage(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) {