Browse Source

Add @ConditionalOnBean to Thymeleaf dialect beans

Fixes gh-1507
pull/1510/head
Phillip Webb 12 years ago
parent
commit
84249da941
  1. 2
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

@ -142,6 +142,7 @@ public class ThymeleafAutoConfiguration { @@ -142,6 +142,7 @@ public class ThymeleafAutoConfiguration {
protected static class DataAttributeDialectConfiguration {
@Bean
@ConditionalOnMissingBean
public DataAttributeDialect dialect() {
return new DataAttributeDialect();
}
@ -153,6 +154,7 @@ public class ThymeleafAutoConfiguration { @@ -153,6 +154,7 @@ public class ThymeleafAutoConfiguration {
protected static class ThymeleafSecurityDialectConfiguration {
@Bean
@ConditionalOnMissingBean
public SpringSecurityDialect securityDialect() {
return new SpringSecurityDialect();
}

Loading…
Cancel
Save