Merge pull request #14 from oleg-nenashev/bug/JENKINS-47574

[JENKINS-47574] - Prevent NPE in EnvInjectAction#getEnvironment() when it's called in readResolve()
jenkinsci · Oct 24, 2017 · 7da8f74 · 7da8f74
2 parents e2d0a75 + a5da0e1
commit 7da8f74
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java b/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java
@@ -163,13 +163,24 @@ public String transformEntry(String key, String value) {
         return this;
     }
 
+    @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE",
+            justification = "JENKINS-47574 - parent may be null during readResolve()")
+    private static boolean runHasNoParent(@Nonnull Run<?,?> run) {
+        return run.getParent() == null;
+    }
+
     @CheckForNull
     private Map<String, String> getEnvironment(@CheckForNull Run<?, ?> build) throws EnvInjectException {
 
         if (build == null) {
             return null;
         }
 
+        // It happens in the case of usage of this logic for a not-fully loaded build
+        if (runHasNoParent(build)) {
+            return null;
+        }
+
         EnvInjectSavable dao = new EnvInjectSavable();
         return dao.getEnvironment(build.getRootDir());
     }