[lucene-solr] branch branch_8x updated: SOLR-14525: chery pick from master did it wrong

[no...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 5827ddf  SOLR-14525: chery pick from master did it wrong
5827ddf is described below

commit 5827ddf2fae664a5c014a42a95db14dd2f3cbbf9
Author: noble <no...@apache.org>
AuthorDate: Thu Jun 4 11:31:50 2020 +1000

    SOLR-14525: chery pick from master did it wrong
---
 .../src/java/org/apache/solr/core/SolrResourceLoader.java | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
index 0fdcf71..e4f28b9 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
@@ -593,21 +593,6 @@ public class SolrResourceLoader implements ResourceLoader,Closeable
           "Error instantiating class: '" + clazz.getName()+"'", e);
     }
 
-    if (!live) {
-      if( obj instanceof SolrCoreAware ) {
-        assertAwareCompatibility( SolrCoreAware.class, obj );
-        waitingForCore.add( (SolrCoreAware)obj );
-      }
-      if( obj instanceof ResourceLoaderAware ) {
-        assertAwareCompatibility( ResourceLoaderAware.class, obj );
-        waitingForResources.add( (ResourceLoaderAware)obj );
-      }
-      if (obj instanceof SolrInfoBean){
-        //TODO: Assert here?
-        infoMBeans.add((SolrInfoBean) obj);
-      }
-    }
-
     addToCoreAware(obj);
     addToResourceLoaderAware(obj);
     addToInfoBeans(obj);