From 5d3a0da50e5877ab5fd9e1576bcc7aebc3f1b600 Mon Sep 17 00:00:00 2001 From: "Konstantin A. Zolotukhin" Date: Sat, 31 Oct 2015 13:36:17 +0200 Subject: [PATCH] null check for command bound circuit breaker --- .../cloud/netflix/hystrix/HystrixHealthIndicator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java index d644ec49..d0a885b7 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java @@ -47,7 +47,7 @@ public class HystrixHealthIndicator extends AbstractHealthIndicator { for (HystrixCommandMetrics metrics : HystrixCommandMetrics.getInstances()) { HystrixCircuitBreaker circuitBreaker = HystrixCircuitBreaker.Factory .getInstance(metrics.getCommandKey()); - if (circuitBreaker.isOpen()) { + if (circuitBreaker != null && circuitBreaker.isOpen()) { openCircuitBreakers.add(metrics.getCommandGroup().name() + "::" + metrics.getCommandKey().name()); }