mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.4.x' into 1.5.x
This commit is contained in:
commit
fd2ab2fee0
@ -116,9 +116,9 @@ public class LiquibaseAutoConfiguration {
|
||||
|
||||
private SpringLiquibase createSpringLiquibase() {
|
||||
SpringLiquibase liquibase;
|
||||
DataSource dataSource = getDataSource();
|
||||
if (dataSource == null) {
|
||||
dataSource = DataSourceBuilder.create().url(this.properties.getUrl())
|
||||
DataSource dataSourceToUse = getDataSource();
|
||||
if (dataSourceToUse == null) {
|
||||
dataSourceToUse = DataSourceBuilder.create().url(this.properties.getUrl())
|
||||
.username(this.properties.getUser())
|
||||
.password(this.properties.getPassword()).build();
|
||||
liquibase = new DataSourceClosingSpringLiquibase();
|
||||
@ -126,7 +126,7 @@ public class LiquibaseAutoConfiguration {
|
||||
else {
|
||||
liquibase = new SpringLiquibase();
|
||||
}
|
||||
liquibase.setDataSource(dataSource);
|
||||
liquibase.setDataSource(dataSourceToUse);
|
||||
return liquibase;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user