From ba1eab20d2b3cc2c3bddcc34cf54ae6ea7cfbcc0 Mon Sep 17 00:00:00 2001
From: Timothy Bish <tabish121@gmail.com>
Date: Wed, 2 Nov 2016 12:57:39 -0400
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-6495

State variables shared across threads in the transport need to be marked
volatile.
(cherry picked from commit 629ee285685b5f63315c8fcd6138a37bd17b958d)
---
 .../activemq/transport/failover/FailoverTransport.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
index a46b3185d6..655f143000 100755
--- a/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
@@ -76,7 +76,7 @@ public class FailoverTransport implements CompositeTransport {
     private static final int DEFAULT_INITIAL_RECONNECT_DELAY = 10;
     private static final int INFINITE = -1;
     private TransportListener transportListener;
-    private boolean disposed;
+    private volatile boolean disposed;
     private final CopyOnWriteArrayList<URI> uris = new CopyOnWriteArrayList<URI>();
     private final CopyOnWriteArrayList<URI> updated = new CopyOnWriteArrayList<URI>();
 
@@ -92,7 +92,7 @@ public class FailoverTransport implements CompositeTransport {
     private final AtomicReference<Transport> connectedTransport = new AtomicReference<Transport>();
     private final TaskRunnerFactory reconnectTaskFactory;
     private final TaskRunner reconnectTask;
-    private boolean started;
+    private volatile boolean started;
     private long initialReconnectDelay = DEFAULT_INITIAL_RECONNECT_DELAY;
     private long maxReconnectDelay = 1000 * 30;
     private double backOffMultiplier = 2d;
@@ -127,7 +127,7 @@ public class FailoverTransport implements CompositeTransport {
     private final ArrayList<URI> priorityList = new ArrayList<URI>();
     private boolean priorityBackupAvailable = false;
     private String nestedExtraQueryOptions;
-    private boolean shuttingDown = false;
+    private volatile boolean shuttingDown = false;
 
     public FailoverTransport() {
         brokerSslContext = SslContext.getCurrentSslContext();