root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Stephane Nicoll 2015-01-26 03:28:17 +01:00
parent 4bee1b0e1b e70c18d05b
commit f5f0952837
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());