root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-30 17:49:53 +02:00
parent f06627c408 10589b90e4
commit 463e11ab2b
1 changed files with 1 additions and 1 deletions
Show Stats 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);
}