[JENKINS-32765] Fix failing tests

jenkinsci · Feb 4, 2016 · 566def3 · 566def3
1 parent bdb3c0c
commit 566def3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
@@ -207,7 +207,7 @@ public PluginManager(ServletContext context, File rootDir) {
         if(!rootDir.exists())
             rootDir.mkdirs();
         String workDir = System.getProperty(PluginManager.class.getName()+".workDir");
-        if (workDir == null) {
+        if (workDir == null && context != null) {
             workDir = context.getInitParameter(PluginManager.class.getName() + ".workDir");
         }
         this.workDir = workDir == null ? null : new File(workDir);