You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/07/27 17:56:03 UTC

[lucene-solr] branch reference_impl updated: @395 ShutdownNow on SolrCoreLoader executor.

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 292624d  @395 ShutdownNow on SolrCoreLoader executor.
292624d is described below

commit 292624da26daf354fbb5a58b73d59eb2b2430991
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 27 12:55:48 2020 -0500

    @395 ShutdownNow on SolrCoreLoader executor.
---
 solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 e564a72..3b9041a 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -368,6 +368,10 @@ public class SolrTestCase extends LuceneTestCase {
     log.info("*******************************************************************");
     log.info("@After Class ------------------------------------------------------");
     try {
+      if (CoreContainer.solrCoreLoadExecutor != null) {
+        CoreContainer.solrCoreLoadExecutor.shutdownNow();
+      }
+
       if (null != testExecutor) {
         testExecutor.shutdown();
       }
@@ -375,7 +379,6 @@ public class SolrTestCase extends LuceneTestCase {
       if (CoreContainer.solrCoreLoadExecutor != null) {
         synchronized (CoreContainer.class) {
           if (CoreContainer.solrCoreLoadExecutor != null) {
-            CoreContainer.solrCoreLoadExecutor.shutdown();
             ParWork.close(CoreContainer.solrCoreLoadExecutor);
             CoreContainer.solrCoreLoadExecutor = null;
           }