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

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Andy Wilkinson
2017-05-15 17:44:42 +01:00
parent 5693acf558 198093c6a8
commit fd2ab2fee0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
View File

@@ -116,9 +116,9 @@ public class LiquibaseAutoConfiguration {
private SpringLiquibase createSpringLiquibase() { private SpringLiquibase createSpringLiquibase() {
SpringLiquibase liquibase; SpringLiquibase liquibase;
DataSource dataSource = getDataSource(); DataSource dataSourceToUse = getDataSource();
if (dataSource == null) { if (dataSourceToUse == null) {
dataSource = DataSourceBuilder.create().url(this.properties.getUrl()) dataSourceToUse = DataSourceBuilder.create().url(this.properties.getUrl())
.username(this.properties.getUser()) .username(this.properties.getUser())
.password(this.properties.getPassword()).build(); .password(this.properties.getPassword()).build();
liquibase = new DataSourceClosingSpringLiquibase(); liquibase = new DataSourceClosingSpringLiquibase();
@@ -126,7 +126,7 @@ public class LiquibaseAutoConfiguration {
else { else {
liquibase = new SpringLiquibase(); liquibase = new SpringLiquibase();
} }
liquibase.setDataSource(dataSource); liquibase.setDataSource(dataSourceToUse);
return liquibase; return liquibase;
} }