Fixing SolverRemote NPE #533

mageddo · Sep 4, 2024 · 301df4b · 301df4b
1 parent 1b8cf1c
commit 301df4b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,6 @@
+## 3.25.14
+* Fixing SolverRemote NPE #533
+
 ## 3.25.13
 * Unifying circuit breaker abstractions #553
 

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=3.25.13-snapshot
+version=3.25.14-snapshot
diff --git a/.../com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactory.java b/.../com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactory.java
@@ -99,16 +99,23 @@ public List<Stats> stats() {
   }
 
   public CircuitStatus findStatus(InetSocketAddress remoteAddress) {
-    return this.circuitBreakerMap.get(remoteAddress)
-      .findStatus();
+    final var circuitBreaker = this.findCircuitBreakerFromCache(remoteAddress);
+    if (circuitBreaker == null) {
+      return null;
+    }
+    return circuitBreaker.findStatus();
   }
 
   private Stats toStats(InetSocketAddress remoteAddr) {
-    final var circuitBreaker = this.circuitBreakerMap.get(remoteAddr);
+    final var circuitBreaker = this.findCircuitBreakerFromCache(remoteAddr);
     final var state = circuitBreaker.findStatus().name();
     return Stats.of(remoteAddr.toString(), state);
   }
 
+  private CircuitBreakerDelegate findCircuitBreakerFromCache(InetSocketAddress remoteAddress) {
+    return this.circuitBreakerMap.get(remoteAddress);
+  }
+
   @Value
   public static class Stats {