fix(mpt): don't NPE on stages without a when (#1783)

spinnaker · Nov 8, 2017 · 631e144 · 631e144
1 parent 52823d6
commit 631e144
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java b/...com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java
@@ -127,12 +127,14 @@ private void renderStage(StageDefinition stage, RenderContext context, String lo
 
     stage.setName(renderStageProperty(stage.getName(), context, getStagePropertyLocation(locationNamespace, stage.getId(), "name")));
     stage.setComments(renderStageProperty(stage.getComments(), context, getStagePropertyLocation(locationNamespace, stage.getId(), "comments")));
-    stage.setWhen(
-      stage.getWhen()
-        .stream()
-        .map(w -> renderStageProperty(w, context, getStagePropertyLocation(locationNamespace, stage.getId(), "when")))
-        .collect(Collectors.toList())
-    );
+    if (stage.getWhen() != null) {
+      stage.setWhen(
+        stage.getWhen()
+          .stream()
+          .map(w -> renderStageProperty(w, context, getStagePropertyLocation(locationNamespace, stage.getId(), "when")))
+          .collect(Collectors.toList())
+      );
+    }
   }
 
   private String renderStageProperty(String input, RenderContext context, String location) {