Merge branch '1.1.x'

pull/2400/merge
Stephane Nicoll 10 years ago
commit f5f0952837

@ -242,7 +242,7 @@ public class HealthIndicatorAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(name = "solrHealthIndicator") @ConditionalOnMissingBean(name = "solrHealthIndicator")
public HealthIndicator rabbitHealthIndicator() { public HealthIndicator solrHealthIndicator() {
if (this.solrServers.size() == 1) { if (this.solrServers.size() == 1) {
return new SolrHealthIndicator(this.solrServers.entrySet().iterator() return new SolrHealthIndicator(this.solrServers.entrySet().iterator()
.next().getValue()); .next().getValue());

Loading…
Cancel
Save