Merge pull request #86 from batmat/JENKINS-49170

[JENKINS-49170] NPE can be thrown on null triggers list
jenkinsci · Jan 29, 2018 · 023a065 · 023a065
2 parents 5edc739 + 9906156
commit 023a065
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty.java b/src/main/java/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty.java
@@ -70,6 +70,15 @@ public PipelineTriggersJobProperty(List<Trigger> triggers) {
         }
     }
 
+    @SuppressWarnings("unused") // called by deserialization
+    protected Object readResolve() {
+        if (triggers == null) {
+            LOGGER.log(Level.WARNING, "triggers attribute was null, this shouldn't happen.");
+            this.triggers = new ArrayList<>();
+        }
+        return this;
+    }
+
     public void setTriggers(List<Trigger<?>> triggers) {
         this.triggers = new ArrayList<>(triggers);
     }