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

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-10-11 11:56:13 +02:00
parent 9d09a385ba 81377e2fd5
commit 3f4fbe32ff
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@@ -156,13 +156,13 @@ public class FlywayAutoConfiguration {
else {
flyway.setDataSource(this.dataSource);
}
if (this.flywayCallbacks.isEmpty()) {
flyway.setCallbacks(this.callbacks.toArray(new Callback[0]));
}
else {
if (this.callbacks.isEmpty()) {
flyway.setCallbacks(
this.flywayCallbacks.toArray(new FlywayCallback[0]));
if (!this.callbacks.isEmpty() || !this.flywayCallbacks.isEmpty()) {
if (this.flywayCallbacks.isEmpty()) {
flyway.setCallbacks(this.callbacks.toArray(new Callback[0]));
}
else if (this.callbacks.isEmpty()) {
flyway.setCallbacks(
this.flywayCallbacks.toArray(new FlywayCallback[0]));
}
else {
throw new IllegalStateException(