[lucene-solr] branch reference_impl updated: @389 Tweaks tests shutdown.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl by this push:
     new a7e1687  @389 Tweaks tests shutdown.
a7e1687 is described below

commit a7e16876d38038b63480353373839e9294918199
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 27 11:41:59 2020 -0500

    @389 Tweaks tests shutdown.
---
 .../src/java/org/apache/solr/SolrTestCase.java       | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index 10e1d57..d6ca226 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -369,16 +369,6 @@ public class SolrTestCase extends LuceneTestCase {
     log.info("@After Class ------------------------------------------------------");
     try {
 
-      if (null != testExecutor) {
-        testExecutor.shutdownNow();
-      }
-
-
-      if (null != testExecutor) {
-        ParWork.close(testExecutor);
-        testExecutor = null;
-      }
-
       if (CoreContainer.solrCoreLoadExecutor != null) {
         synchronized (CoreContainer.class) {
           if (CoreContainer.solrCoreLoadExecutor != null) {
@@ -389,6 +379,16 @@ public class SolrTestCase extends LuceneTestCase {
         }
       }
 
+      if (null != testExecutor) {
+        testExecutor.shutdown();
+      }
+
+
+      if (null != testExecutor) {
+        ParWork.close(testExecutor);
+        testExecutor = null;
+      }
+
       ParWork.closeExecutor();
 
       SysStats.getSysStats().stopMonitor();