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 pull request #9832 from Johnny Lim 

* gh-9832:
  Use currentHealth consistently in getHealth()
This commit is contained in:
Andy Wilkinson 2017-07-22 08:22:06 +01:00
parent 39b4ecdf63 d18e452fcd
commit be535103a7
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/endpoint/mvc/HealthMvcEndpoint.java
View File

@ -165,7 +165,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
private Health getHealth(HttpServletRequest request, Principal principal) { private Health getHealth(HttpServletRequest request, Principal principal) {
Health currentHealth = getCurrentHealth(); Health currentHealth = getCurrentHealth();
if (exposeHealthDetails(request, principal)) { if (exposeHealthDetails(request, principal)) {
return this.cachedHealth.health; return currentHealth;
} }
return Health.status(currentHealth.getStatus()).build(); return Health.status(currentHealth.getStatus()).build();
} }