From 81377e2fd5f716ad7a52a2757486789b5704e261 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 11 Oct 2018 11:50:53 +0200 Subject: [PATCH] Invoke Flyway#setCallbacks only if necessary Closes gh-14775 --- .../boot/autoconfigure/flyway/FlywayAutoConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index 2c4b05a047..4615a32b20 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -149,7 +149,9 @@ public class FlywayAutoConfiguration { else { flyway.setDataSource(this.dataSource); } - flyway.setCallbacks(this.flywayCallbacks.toArray(new FlywayCallback[0])); + if (!this.flywayCallbacks.isEmpty()) { + flyway.setCallbacks(this.flywayCallbacks.toArray(new FlywayCallback[0])); + } String[] locations = new LocationResolver(flyway.getDataSource()) .resolveLocations(this.properties.getLocations()); checkLocationExists(locations);