From 9b0b9032e2571b3a37aef93d823161b1b934381e Mon Sep 17 00:00:00 2001
From: markrmiller <markrmiller@apache.org>
Date: Sat, 1 Dec 2018 00:50:54 -0600
Subject: [PATCH] SOLR-12801: Fix thread leak in test.

---
 .../solr/cloud/autoscaling/sim/TestSimDistributedQueue.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
index bdf0737351f..ed9aac247af 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
@@ -215,7 +215,7 @@ public class TestSimDistributedQueue extends SolrTestCaseJ4 {
       super.tearDown();
     } catch (Exception exc) {
     }
-    executor.shutdown();
+    ExecutorUtil.shutdownAndAwaitTermination(executor);
   }
 
 }