[FIXED JENKINS-13353] avoid benign NPE when saving a configuration on…

… a master with no executors
jenkinsci · Apr 5, 2012 · 91c658a · 91c658a
1 parent 16ef60d
commit 91c658a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/perforce/PerforceSCM.java b/src/main/java/hudson/plugins/perforce/PerforceSCM.java
@@ -322,9 +322,14 @@ public PerforceSCM(
         String systemRoot = null;
         if (Hudson.isWindows()) {
             try {
-                EnvVars envVars = Computer.currentComputer().getEnvironment();
-                systemDrive = envVars.get("SystemDrive");
-                systemRoot = envVars.get("SystemRoot");
+                Computer currentComputer = Computer.currentComputer();
+                // A master with no executors seems to throw an NPE here, so
+                // we need to check for null.
+                if(currentComputer != null) {
+                    EnvVars envVars = currentComputer.getEnvironment();
+                    systemDrive = envVars.get("SystemDrive");
+                    systemRoot = envVars.get("SystemRoot");
+                }
             } catch (Exception ex) {
                 LOGGER.log(Level.WARNING, ex.getMessage(), ex);
             }