From 11149443e3677ac3164ce13528ce09c3e4d9c07e Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 14 Nov 2013 14:55:03 +0000 Subject: [PATCH] Make sure Batch autoconfig only gets inlcuded once --- .../boot/autoconfigure/batch/BatchAutoConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java index 8beecd002a..3ad69bf790 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java @@ -36,6 +36,7 @@ import org.springframework.context.annotation.Configuration; public class BatchAutoConfiguration { @Bean + @ConditionalOnMissingBean(BatchDatabaseInitializer.class) public BatchDatabaseInitializer batchDatabaseInitializer() { return new BatchDatabaseInitializer(); }