From f9e1fe142156309cfabaa4e329925c6b33bb87f5 Mon Sep 17 00:00:00 2001
From: Tom Fennelly <tom.fennelly@gmail.com>
Date: Fri, 22 Jan 2016 11:07:38 +0000
Subject: [PATCH] Fixups to PluginManager - getActiveInstance

---
 core/src/main/java/hudson/PluginManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<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")) {