[lucene-solr] branch reference_impl updated: @411 Try this order.

[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 00f72b2  @411 Try this order.
00f72b2 is described below

commit 00f72b2037dc17384ff43acfdc51f90fe5f7f908
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 27 18:47:04 2020 -0500

    @411 Try this order.
---
 solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 5 +++--
 1 file changed, 3 insertions(+), 2 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 4a4fe57..6b7286e 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -385,13 +385,14 @@ public class SolrTestCase extends LuceneTestCase {
         }
       }
 
+      ParWork.closeExecutor();
+
       if (null != testExecutor) {
+        testExecutor.shutdownNow();
         ParWork.close(testExecutor);
         testExecutor = null;
       }
 
-      ParWork.closeExecutor();
-
       SysStats.getSysStats().stopMonitor();
 
       if (!failed && suiteFailureMarker.wasSuccessful() ) {