From ef747c8445a5e3d698f7f02777c528883351f293 Mon Sep 17 00:00:00 2001
From: Alan Woodward <romseygeek@apache.org>
Date: Fri, 30 Sep 2016 09:05:01 +0100
Subject: [PATCH] SOLR-9556: Exit failover thread on interrupt

---
 solr/CHANGES.txt                                               | 3 +++
 .../apache/solr/cloud/OverseerAutoReplicaFailoverThread.java   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 45a8c8bdcd5..1e347de805d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -141,6 +141,9 @@ Bug Fixes
 * SOLR-9554: Fix NullPointerException when cores are loaded in parallel and switch schema.xml to managed-scheme.
  (Alan Woodward, Mikhail Khludnev)
 
+* SOLR-9556: OverseerAutoFailoverReplicaThread was not exiting on interrupt
+  (Alan Woodward)
+
 Optimizations
 ----------------------
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
index 99f01925611..83679a549c7 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
@@ -137,6 +137,7 @@ public class OverseerAutoReplicaFailoverThread implements Runnable, Closeable {
           Thread.sleep(workLoopDelay);
         } catch (InterruptedException e) {
           Thread.currentThread().interrupt();
+          return;
         }
       }
     }