Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson
2017-07-22 08:22:35 +01:00

View File

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