From 84249da941bb3940923503cb207f3b2ef341e75b Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Thu, 4 Sep 2014 17:54:40 -0700
Subject: [PATCH] Add @ConditionalOnBean to Thymeleaf dialect beans

Fixes gh-1507
---
 .../autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git 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
index 34ed0543614..5f706c09e7f 100644
--- 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();
 		}