Skip to content

S
spring-boot
Commit 84249da9 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Add @ConditionalOnBean to Thymeleaf dialect beans 

Fixes gh-1507
parent 4d27458f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View file @ 84249da9
...@@ -142,6 +142,7 @@ public class ThymeleafAutoConfiguration { ...@@ -142,6 +142,7 @@ public class ThymeleafAutoConfiguration {
protected static class DataAttributeDialectConfiguration { protected static class DataAttributeDialectConfiguration {
@Bean @Bean
@ConditionalOnMissingBean
public DataAttributeDialect dialect() { public DataAttributeDialect dialect() {
return new DataAttributeDialect(); return new DataAttributeDialect();
} }
...@@ -153,6 +154,7 @@ public class ThymeleafAutoConfiguration { ...@@ -153,6 +154,7 @@ public class ThymeleafAutoConfiguration {
protected static class ThymeleafSecurityDialectConfiguration { protected static class ThymeleafSecurityDialectConfiguration {
@Bean @Bean
@ConditionalOnMissingBean
public SpringSecurityDialect securityDialect() { public SpringSecurityDialect securityDialect() {
return new SpringSecurityDialect(); return new SpringSecurityDialect();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment