[solr] branch jira/solr-14688_poc updated: clean up

[no...@apache.org]

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

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


The following commit(s) were added to refs/heads/jira/solr-14688_poc by this push:
     new 32477bb  clean up
32477bb is described below

commit 32477bb1ba0eb6f6d76cd5755a016bf6b7ed7773
Author: Noble Paul <no...@gmail.com>
AuthorDate: Mon Jan 24 13:31:10 2022 +1100

    clean up
---
 solr/core/src/java/org/apache/solr/pkg/PackageLoader.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageLoader.java b/solr/core/src/java/org/apache/solr/pkg/PackageLoader.java
index cfab4d4..f2f5999 100644
--- a/solr/core/src/java/org/apache/solr/pkg/PackageLoader.java
+++ b/solr/core/src/java/org/apache/solr/pkg/PackageLoader.java
@@ -63,7 +63,6 @@ public class PackageLoader implements Closeable {
 
   private final CoreContainer coreContainer;
   private final Map<String, Package> packageClassLoaders = new ConcurrentHashMap<>();
-  private final Map<String, Package> localPackageClassLoaders = new HashMap<>();
   public  PackageAPI.Packages localPackages;
 
   private PackageAPI.Packages myCopy =  new PackageAPI.Packages();
@@ -112,7 +111,7 @@ public class PackageLoader implements Closeable {
       if(!enabledPackages.contains(e.getKey())) continue;
       Package p = new Package(e.getKey());
       p.updateVersions(e.getValue(), packagesPath);
-      localPackageClassLoaders.put(e.getKey(), p);
+      packageClassLoaders.put(e.getKey(), p);
     }
   }
 
@@ -121,8 +120,7 @@ public class PackageLoader implements Closeable {
   }
 
   public Package getPackage(String key) {
-    Package result = packageClassLoaders.get(key);
-    return result == null ? localPackageClassLoaders.get(key) : result;
+   return packageClassLoaders.get(key);
   }
 
   public Map<String, Package> getPackages() {