Add @ConditionalOnBean to Thymeleaf dialect beans

Fixes gh-1507
2014-09-04 17:54:40 -07:00
parent 4d27458fee
commit 84249da941
1 changed files with 2 additions and 0 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -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 {
 	protected static class ThymeleafSecurityDialectConfiguration {

 		@Bean
+		@ConditionalOnMissingBean
 		public SpringSecurityDialect securityDialect() {
 			return new SpringSecurityDialect();
 		}