Merge branch '1.1.x'

This commit is contained in:
Dave Syer
2014-08-25 17:18:36 +01:00
12 changed files with 392 additions and 0 deletions

View File

@@ -78,6 +78,11 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
try {
this.applicationContext.publishEvent(new DataSourceInitializedEvent(
this.dataSource));
// The listener might not be registered yet, so don't rely on it.
if (!this.initialized) {
runDataScripts();
this.initialized = true;
}
}
catch (IllegalStateException ex) {
logger.warn("Could not send event to complete DataSource initialization ("