[lucene] 31/42: merging with master

[dw...@apache.org]

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

dweiss pushed a commit to branch jira/solr14155-1
in repository https://gitbox.apache.org/repos/asf/lucene.git

commit ecee4975ac3711b9379e6a51c76e591a824a62ba
Author: noblepaul <no...@gmail.com>
AuthorDate: Tue Sep 8 14:14:08 2020 +1000

    merging with master
---
 solr/core/src/java/org/apache/solr/core/SolrCore.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 368b9e8..b11e315 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -230,8 +230,6 @@ public final class SolrCore implements SolrInfoBean, Closeable {
   private final ConfigSet configSet;
   //singleton listener for all packages used in schema
 
-  //a single package listener for all cores that require core reloading
-  private final PackageListeningClassLoader coreReloadingClassLoader;
   private final CircuitBreakerManager circuitBreakerManager;
 
   private final List<Runnable> confListeners = new CopyOnWriteArrayList<>();
@@ -948,11 +946,6 @@ public final class SolrCore implements SolrInfoBean, Closeable {
       this.resourceLoader = configSet.getSolrConfig().getResourceLoader();
       IndexSchema schema = configSet.getIndexSchema();
 
-      this.coreReloadingClassLoader = new PackageListeningClassLoader(coreContainer,
-              resourceLoader,
-              solrConfig::maxPackageVersion,
-              () -> coreContainer.reload(name, uniqueId));
-      this.packageListeners.addListener(coreReloadingClassLoader);
       this.configSetProperties = configSet.getProperties();
       // Initialize the metrics manager
       this.coreMetricManager = initCoreMetricManager(solrConfig);
@@ -3233,9 +3226,6 @@ public final class SolrCore implements SolrInfoBean, Closeable {
     return blobRef;
   }
 
-  public PackageListeningClassLoader getCoreReloadingClassLoader(){
-    return coreReloadingClassLoader;
-  }
   /**
    * Run an arbitrary task in it's own thread. This is an expert option and is
    * a method you should use with great care. It would be bad to run something that never stopped