fix(pipelinetemplate): Default spring condition if prop is unset (#1240)

spinnaker · Mar 23, 2017 · a97753c · a97753c
1 parent 9003d06
commit a97753c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...mplate/src/main/java/com/netflix/spinnaker/orca/config/PipelineTemplateConfiguration.java b/...mplate/src/main/java/com/netflix/spinnaker/orca/config/PipelineTemplateConfiguration.java
@@ -47,13 +47,13 @@ RenderedValueConverter jsonRenderedValueConverter(ObjectMapper pipelineTemplateO
   }
 
   @Bean
-  @ConditionalOnExpression("!${pipelineTemplate.jinja.enabled}")
+  @ConditionalOnExpression("!${pipelineTemplate.jinja.enabled:false}")
   Renderer handlebarsRenderer(RenderedValueConverter renderedValueConverter, ObjectMapper pipelineTemplateObjectMapper) {
     return new HandlebarsRenderer(renderedValueConverter, pipelineTemplateObjectMapper);
   }
 
   @Bean
-  @ConditionalOnExpression("${pipelineTemplate.jinja.enabled}")
+  @ConditionalOnExpression("${pipelineTemplate.jinja.enabled:false}")
   Renderer jinjaRenderer(RenderedValueConverter renderedValueConverter, ObjectMapper pipelineTemplateObjectMapper) {
     return new JinjaRenderer(renderedValueConverter, pipelineTemplateObjectMapper);
   }