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/09/08 04:14:21 UTC

[lucene-solr] 04/05: @804 Tweak it.

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

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

commit 3d17537dbe59d4a353f80744ac799663e2ef91ec
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Sep 7 23:04:42 2020 -0500

    @804 Tweak it.
---
 .../org/apache/solr/common/util/SolrScheduledExecutorScheduler.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/solr/solrj/src/java/org/apache/solr/common/util/SolrScheduledExecutorScheduler.java b/solr/solrj/src/java/org/apache/solr/common/util/SolrScheduledExecutorScheduler.java
index ff46319..3d0fb0e 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/SolrScheduledExecutorScheduler.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/SolrScheduledExecutorScheduler.java
@@ -100,8 +100,9 @@ public class SolrScheduledExecutorScheduler extends AbstractLifeCycle implements
   protected void doStop() throws Exception {
     ScheduledThreadPoolExecutor fscheduler = scheduler;
     if (fscheduler != null) {
-      fscheduler.shutdown();
       super.doStop();
+      fscheduler.shutdown();
+      fscheduler.awaitTermination(3, TimeUnit.SECONDS); // nocommit - trying something
       fscheduler.shutdownNow();
       ExecutorUtil.awaitTermination(fscheduler);
     }