This is an automated email from the ASF dual-hosted git repository. noble pushed a commit to branch jira/solr16547 in repository https://gitbox.apache.org/repos/asf/solr.git
commit a498224431866bc80f247bef5db3b65458e2b8db Author: Noble Paul <[email protected]> AuthorDate: Wed Nov 16 15:48:05 2022 +1100 tidy --- solr/core/src/java/org/apache/solr/core/PluginBag.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/core/PluginBag.java b/solr/core/src/java/org/apache/solr/core/PluginBag.java index 693558edd28..26b1ecf53dc 100644 --- a/solr/core/src/java/org/apache/solr/core/PluginBag.java +++ b/solr/core/src/java/org/apache/solr/core/PluginBag.java @@ -149,9 +149,9 @@ public class PluginBag<T> implements AutoCloseable { */ boolean alias(String src, String target) { if (src == null) return false; - PluginHolder<T> a = registry.get(src); + PluginHolder<T> a = getHolder(src); if (a == null) return false; - PluginHolder<T> b = registry.get(target); + PluginHolder<T> b = getHolder(target); if (b != null) return false; registry.put(target, a); return true; @@ -159,13 +159,14 @@ public class PluginBag<T> implements AutoCloseable { /** Get a plugin by name. If the plugin is not already instantiated, it is done here */ public T get(String name) { - PluginHolder<T> result = registry.get(name); - if (result == null && defaults != null) result = defaults.get(name); + PluginHolder<T> result = getHolder(name); return result == null ? null : result.get(); } public PluginHolder<T> getHolder(String name) { - return registry.get(name); + PluginHolder<T> result = registry.get(name); + if (result == null && defaults != null) result = defaults.get(name); + return result; } /** @@ -207,7 +208,7 @@ public class PluginBag<T> implements AutoCloseable { } void setDefault(String def) { - if (!registry.containsKey(def)) return; + if (getHolder(def) == null) return; if (this.def != null) { log.warn("Multiple defaults for : {}", meta.getCleanTag()); } @@ -215,7 +216,7 @@ public class PluginBag<T> implements AutoCloseable { } public boolean contains(String name) { - return registry.containsKey(name); + return getHolder(name) != null; } String getDefault() {
