Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13302 from izeye:remove-unnecessary-quartz-data-source

Browse Source 
* pr/13302:
  Remove an unnecessary @QuartzDataSource
This commit is contained in:
Stephane Nicoll
2018-05-30 17:49:41 +02:00
parent b47a72731f 4eb070767c
commit 10589b90e4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
View File

@@ -145,7 +145,7 @@ public class QuartzAutoConfiguration {
}
private DataSource getDataSource(DataSource dataSource,
@QuartzDataSource ObjectProvider<DataSource> quartzDataSource) {
ObjectProvider<DataSource> quartzDataSource) {
DataSource dataSourceIfAvailable = quartzDataSource.getIfAvailable();
return (dataSourceIfAvailable != null ? dataSourceIfAvailable : dataSource);
}