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/10/01 23:46:45 UTC
[lucene-solr] 04/26: @887 Tweak close.
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 47d0a74c3cb97698010e0332d53b52081ee673d8
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Oct 1 08:46:54 2020 -0500
@887 Tweak close.
---
solr/core/src/java/org/apache/solr/update/CommitTracker.java | 1 -
solr/core/src/java/org/apache/solr/update/UpdateHandler.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/update/CommitTracker.java b/solr/core/src/java/org/apache/solr/update/CommitTracker.java
index b21eb82..600c3e9 100644
--- a/solr/core/src/java/org/apache/solr/update/CommitTracker.java
+++ b/solr/core/src/java/org/apache/solr/update/CommitTracker.java
@@ -120,7 +120,6 @@ public final class CommitTracker implements Runnable, Closeable {
// okay
}
pending = null;
- scheduler.shutdownNow();
ParWork.close(scheduler);
} finally {
lock.unlock();
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
index 83631af..0b01127 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
@@ -100,7 +100,7 @@ UpdateHandler implements SolrInfoBean, Closeable {
@Override
public void close() throws IOException {
this.closed = true;
- if (ulog != null) ulog.close();
+ if (ulog != null) ulog.close(true);
assert ObjectReleaseTracker.release(this);
}