[lucene-solr] branch jira/solr-13579 updated: SOLR-13579: Fix issues after merge.

[ab...@apache.org]

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

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


The following commit(s) were added to refs/heads/jira/solr-13579 by this push:
     new 9f3431e  SOLR-13579: Fix issues after merge.
9f3431e is described below

commit 9f3431eea71486e7f5e1d707d457b2fb9f72dfcf
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue May 26 18:46:10 2020 +0200

    SOLR-13579: Fix issues after merge.
---
 .../core/src/java/org/apache/solr/managed/DefaultResourceManager.java | 4 ++--
 solr/core/src/java/org/apache/solr/search/CaffeineCache.java          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/managed/DefaultResourceManager.java b/solr/core/src/java/org/apache/solr/managed/DefaultResourceManager.java
index 5f07e42..6f9d905 100644
--- a/solr/core/src/java/org/apache/solr/managed/DefaultResourceManager.java
+++ b/solr/core/src/java/org/apache/solr/managed/DefaultResourceManager.java
@@ -31,12 +31,12 @@ import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.request.beans.ResourcePoolConfig;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.IOUtils;
+import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.solr.common.util.TimeSource;
 import org.apache.solr.core.PluginInfo;
 import org.apache.solr.core.SolrResourceLoader;
 import org.apache.solr.managed.types.CacheManagerPool;
 import org.apache.solr.search.SolrCache;
-import org.apache.solr.util.DefaultSolrThreadFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -119,7 +119,7 @@ public class DefaultResourceManager extends ResourceManager {
   protected void doInit() throws Exception {
     if (scheduledThreadPoolExecutor == null) {
       scheduledThreadPoolExecutor = (ScheduledThreadPoolExecutor) Executors.newScheduledThreadPool(DEFAULT_NODE_POOLS.size(),
-          new DefaultSolrThreadFactory(getClass().getSimpleName()));
+          new SolrNamedThreadFactory(getClass().getSimpleName()));
       scheduledThreadPoolExecutor.setMaximumPoolSize(maxNumPools);
       scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
       scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
diff --git a/solr/core/src/java/org/apache/solr/search/CaffeineCache.java b/solr/core/src/java/org/apache/solr/search/CaffeineCache.java
index e05979c..8573897 100644
--- a/solr/core/src/java/org/apache/solr/search/CaffeineCache.java
+++ b/solr/core/src/java/org/apache/solr/search/CaffeineCache.java
@@ -232,7 +232,7 @@ public class CaffeineCache<K, V> extends SolrCacheBase implements SolrCache<K, V
   }
 
   @Override
-  public void close() throws IOException {
+  public void close() throws Exception {
     SolrCache.super.close();
     cache.invalidateAll();
     cache.cleanUp();