From d3324c8d4f0797b28eed44681cac9ec6a4d3f73c Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Thu, 16 Mar 2017 18:00:00 -0400
Subject: [PATCH] Trap exception from SockJS HeartbeatTask

Issue: SPR-15307
---
 .../socket/sockjs/transport/session/AbstractSockJsSession.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
index c9f170d598..c8a45096e3 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
@@ -455,6 +455,9 @@ public abstract class AbstractSockJsSession implements SockJsSession {
 					try {
 						sendHeartbeat();
 					}
+					catch (Throwable ex) {
+						// Ignore: already handled in writeFrame...
+					}
 					finally {
 						this.expired = true;
 					}