sidestep NPE in the case of total connection failure

Kong · Dec 16, 2023 · fa54e54 · fa54e54
1 parent f298362
commit fa54e54
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/RetryTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/RetryTest.java
@@ -26,6 +26,7 @@
 package BehaviorTests;
 
 import kong.unirest.core.*;
+import net.bytebuddy.implementation.bind.annotation.IgnoreForBinding;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/unirest/src/main/java/kong/unirest/core/RetryStrategy.java b/unirest/src/main/java/kong/unirest/core/RetryStrategy.java
@@ -87,12 +87,16 @@ public Standard(int maxAttempts){
 
         @Override
         public boolean isRetryable(HttpResponse response) {
-            return RETRY_CODES.contains(response.getStatus())
+            return response != null &&
+                    RETRY_CODES.contains(response.getStatus())
                     && response.getHeaders().containsKey(RETRY_AFTER);
         }
 
         @Override
         public long getWaitTime(HttpResponse response) {
+            if(response == null){
+                return 0;
+            }
             String value = response.getHeaders().getFirst(RETRY_AFTER);
             return parseToMillies(value);
         }

diff --git a/unirest/src/test/java/kong/unirest/core/RetryStrategyTest.java b/unirest/src/test/java/kong/unirest/core/RetryStrategyTest.java
@@ -59,6 +59,21 @@ void parseHttpDateFormat() {
         assertEquals(1000, parseToMillies("Wed, 21 Oct 2015 07:28:01 GMT"));
     }
 
+    @Test
+    void nullRespoinseIsAFalse() {
+        assertFalse(new RetryStrategy.Standard(1).isRetryable(null));
+    }
+
+    @Test
+    void nullRespoinseIsZeroSeconds() {
+        assertEquals(0, new RetryStrategy.Standard(1).getWaitTime(null));
+    }
+
+    @Test
+    void unparseableRetruIsZeroSeconds() {
+        assertEquals(0, parseToMillies("Love Shack Baby"));
+    }
+
     private long parseToMillies(String s) {
         Headers h = new Headers();
         h.add("Retry-After", s);