Merge branch '1.5.x'

pull/6770/merge
Stephane Nicoll 8 years ago
commit 740813a1e8

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

Loading…
Cancel
Save