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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2016-12-27 11:42:03 +01:00
parent 3fdfc3f052 0d4ef3dbdb
commit 740813a1e8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
View File

@@ -193,8 +193,8 @@ public class HealthIndicatorAutoConfiguration {
}
private static Map<String, DataSource> filterDataSources(
Map<String,DataSource> candidates) {
Map<String,DataSource> dataSources = new LinkedHashMap<String, DataSource>();
Map<String, DataSource> candidates) {
Map<String, DataSource> dataSources = new LinkedHashMap<String, DataSource>();
for (Map.Entry<String, DataSource> entry : candidates.entrySet()) {
if (!(entry.getValue() instanceof AbstractRoutingDataSource)) {
dataSources.put(entry.getKey(), entry.getValue());