[JENKINS-47574] - Be protective against null parents in readResolve()

jenkinsci · Oct 22, 2017 · cb7ba5a · cb7ba5a
1 parent 781b257
commit cb7ba5a
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
@@ -159,13 +159,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());
     }