From 5d59e3f9db3326cf0cf297c2d96539c08a78cd61 Mon Sep 17 00:00:00 2001 From: AbelPelser Date: Wed, 22 Nov 2023 10:56:41 -0500 Subject: [PATCH] GH-403: Fix NPE in the CitcuitBreakerRetryPolicy Fixes https://github.com/spring-projects/spring-retry/issues/403 The `openTimeout` resolution logic uses `this.resetTimeoutSupplier` by mistake --- .../springframework/retry/policy/CircuitBreakerRetryPolicy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/retry/policy/CircuitBreakerRetryPolicy.java b/src/main/java/org/springframework/retry/policy/CircuitBreakerRetryPolicy.java index 45aa756..e0ea207 100644 --- a/src/main/java/org/springframework/retry/policy/CircuitBreakerRetryPolicy.java +++ b/src/main/java/org/springframework/retry/policy/CircuitBreakerRetryPolicy.java @@ -118,7 +118,7 @@ public class CircuitBreakerRetryPolicy implements RetryPolicy { resetTimeout = this.resetTimeoutSupplier.get(); } long openTimeout = this.openTimeout; - if (this.resetTimeoutSupplier != null) { + if (this.openTimeoutSupplier != null) { openTimeout = this.openTimeoutSupplier.get(); } return new CircuitBreakerRetryContext(parent, this.delegate, resetTimeout, openTimeout);