From 4eb070767c221fc4ed74004cf0d9f0e15d1aa27f Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 31 May 2018 00:22:16 +0900 Subject: [PATCH] Remove an unnecessary @QuartzDataSource Closes gh-13302 --- .../boot/autoconfigure/quartz/QuartzAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java index dbc5475407..3e9d06f180 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java @@ -145,7 +145,7 @@ public class QuartzAutoConfiguration { } private DataSource getDataSource(DataSource dataSource, - @QuartzDataSource ObjectProvider quartzDataSource) { + ObjectProvider quartzDataSource) { DataSource dataSourceIfAvailable = quartzDataSource.getIfAvailable(); return (dataSourceIfAvailable != null ? dataSourceIfAvailable : dataSource); }