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/29 02:46:16 UTC
[lucene-solr] 01/02: @446 Still can leak.
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 6957b40832d7f86a49d5bcf47dfe21ea6428f06c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 28 21:45:46 2020 -0500
@446 Still can leak.
---
solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java b/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
index 020e920..b286aac 100644
--- a/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
@@ -311,14 +311,13 @@ public abstract class AuditLoggerPlugin implements Closeable, Runnable, SolrInfo
*/
@Override
public void close() throws IOException {
- if (async && executorService != null) {
+ if (executorService != null) {
executorService.shutdown();
waitForQueueToDrain(15);
closed = true;
log.info("Shutting down async Auditlogger background thread(s)");
- if (executorService != null) {
- ParWork.close(executorService);
- }
+ executorService.shutdownNow();
+ ParWork.close(executorService);
}
try {
SolrInfoBean.super.close();