Protect sendHeartbeat from cancellation

Issue: SPR-14564
2016-08-08 17:33:57 -04:00
parent 5c8573233a
commit 977b67e418
2 changed files with 4 additions and 0 deletions
--- a/change.diff
+++ b/change.diff
--- 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
@@ -252,6 +252,10 @@ public abstract class AbstractSockJsSession implements SockJsSession {
 		if (isActive()) {
 			if (heartbeatLock.tryLock()) {
 				try {
+					if (this.heartbeatTask == null) {
+						// Cancelled while waiting to acquire the lock
+						return;
+					}
 					writeFrame(SockJsFrame.heartbeatFrame());
 					scheduleHeartbeat();
 				}