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

Delay instantiation of DataSource as late as possible

Browse Source 
Unfortunately it still has to happen in a @PostConstruct (otherwise
JPA never sees the schema in time), but we can delay a bit by not
using @Autowired. Appears to fix the Spring Cloud problem
(https://github.com/spring-cloud/spring-cloud-config/issues/105).

Fixes gh-2658
This commit is contained in:
Dave Syer
2015-03-16 09:18:00 +00:00
parent 018310e478
commit f1ecf53495
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
View File

@@ -50,7 +50,6 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
@Autowired
private ConfigurableApplicationContext applicationContext;
@Autowired(required = false)
private DataSource dataSource;
@Autowired
@@ -59,11 +58,14 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
private boolean initialized = false;
@PostConstruct
protected void initialize() {
public void init() {
if (!this.properties.isInitialize()) {
logger.debug("Initialization disabled (not running DDL scripts)");
return;
}
if (applicationContext.getBeanNamesForType(DataSource.class, false, false).length > 0) {
this.dataSource = applicationContext.getBean(DataSource.class);
}
if (this.dataSource == null) {
logger.debug("No DataSource found so not initializing");
return;