From 40c203ca71653bf811da3debee1e54d6a80f28cb Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Sun, 29 Jun 2014 16:54:17 -0400
Subject: [PATCH] Minor fix in STOMP broker relay

This is a backport for a change made as part of:
https://github.com/spring-projects/spring-framework/commit/113fd1180a14656a89d6d6639d259c577d70fbc5

Issue: SPR-11884
---
 .../messaging/simp/stomp/StompBrokerRelayMessageHandler.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
index 22b3aeba0a4..1c1f0d4ce44 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -648,6 +648,8 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler
 			}
 			finally {
 				try {
+					// Prevent clearConnection() from trying to close
+					this.tcpConnection = null;
 					clearConnection();
 				}
 				catch (Throwable t) {