OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-04 07:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixups to PluginManager - getActiveInstance

Browse Source
This commit is contained in:
Tom Fennelly committed 2016-01-22 11:07:38 +00:00
1 parent b5fa04f048
commit f9e1fe1421
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/hudson/PluginManager.java
+2 -2
View File
@@ -437,7 +437,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
protected @Nonnull Set<String> loadPluginsFromWar(@Nonnull String fromPath, @CheckForNull FilenameFilter filter) {
Set<String> names = new HashSet();
ServletContext context = Jenkins.getInstance().servletContext;
ServletContext context = Jenkins.getActiveInstance().servletContext;
Set<String> plugins = Util.fixNull((Set<String>) context.getResourcePaths(fromPath));
Set<URL> copiedPlugins = new HashSet<>();
Set<URL> 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")) {