diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index d31cb629a8..4e9e7f773f 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -437,7 +437,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas protected @Nonnull Set loadPluginsFromWar(@Nonnull String fromPath, @CheckForNull FilenameFilter filter) { Set names = new HashSet(); - ServletContext context = Jenkins.getInstance().servletContext; + ServletContext context = Jenkins.getActiveInstance().servletContext; Set plugins = Util.fixNull((Set) context.getResourcePaths(fromPath)); Set copiedPlugins = new HashSet<>(); Set dependencies = new HashSet<>(); @@ -499,7 +499,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas String dependencySpec = manifest.getMainAttributes().getValue("Plugin-Dependencies"); if (dependencySpec != null) { String[] dependencyTokens = dependencySpec.split(","); - ServletContext context = Jenkins.getInstance().servletContext; + ServletContext context = Jenkins.getActiveInstance().servletContext; for (String dependencyToken : dependencyTokens) { if (dependencyToken.endsWith(";resolution:=optional")) {