From 566def3bd6e0d1f9fd8b0cd6f7e9600c95107780 Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Thu, 4 Feb 2016 17:12:10 +0000
Subject: [PATCH] [JENKINS-32765] Fix failing tests

---
 core/src/main/java/hudson/PluginManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 43cf4778ea..7aa8a6202f 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -207,7 +207,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
         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);
-- 
GitLab