Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-07-13 09:59:27 +01:00
commit 58509ed7c5

View File

@ -52,7 +52,7 @@ public class CompositeHealthIndicator implements HealthIndicator {
public CompositeHealthIndicator(HealthAggregator healthAggregator,
Map<String, HealthIndicator> indicators) {
Assert.notNull(healthAggregator, "HealthAggregator must not be null");
Assert.notNull(healthAggregator, "Indicators must not be null");
Assert.notNull(indicators, "Indicators must not be null");
this.indicators = new LinkedHashMap<String, HealthIndicator>(indicators);
this.healthAggregator = healthAggregator;
}