From eb83b2e0c2bd02402cc0b5bd011a5029a8fa8b82 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 1 Feb 2018 20:30:08 -0800 Subject: [PATCH] Fix DataSourceHealthIndicator test failure Fix failure introduced in commit 8af02ce05b. See gh-11880 --- .../boot/actuate/jdbc/DataSourceHealthIndicator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java index 73779c09bc..35309af540 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java @@ -86,7 +86,7 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator super("DataSource health check failed"); this.dataSource = dataSource; this.query = query; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = (dataSource == null ? null : new JdbcTemplate(dataSource)); } @Override