[lucene-solr] branch reference_impl updated: @392 Tweak test 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 72368ee  @392 Tweak test shutdown.
72368ee is described below

commit 72368ee7d94883cd9fe68d9e964fa19a1337ddf8
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 27 12:28:39 2020 -0500

    @392 Tweak test shutdown.
---
 .../src/java/org/apache/solr/SolrTestCase.java               | 12 +++++-------
 1 file changed, 5 insertions(+), 7 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 d6ca226..13735ab 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -368,22 +368,20 @@ public class SolrTestCase extends LuceneTestCase {
     log.info("*******************************************************************");
     log.info("@After Class ------------------------------------------------------");
     try {
+      if (null != testExecutor) {
+        testExecutor.shutdown();
+      }
 
       if (CoreContainer.solrCoreLoadExecutor != null) {
         synchronized (CoreContainer.class) {
           if (CoreContainer.solrCoreLoadExecutor != null) {
-            CoreContainer.solrCoreLoadExecutor.shutdownNow();
+            CoreContainer.solrCoreLoadExecutor.shutdown();
             ExecutorUtil.shutdownAndAwaitTermination(CoreContainer.solrCoreLoadExecutor);
             CoreContainer.solrCoreLoadExecutor = null;
           }
         }
       }
-
-      if (null != testExecutor) {
-        testExecutor.shutdown();
-      }
-
-
+      
       if (null != testExecutor) {
         ParWork.close(testExecutor);
         testExecutor = null;