Fixes retrials without Thread.sleep when thread gets interrupted (OpenFeign#627)

MichalSzewczyk · velo · commit ea51e7014e94 · 2018-04-08T20:07:49.000+12:00
* Fixes retrials without Thread.sleep when thread gets interrupted

* Added test to verify if default retryer propagates RetryableException exception when thread is interrupted
diff --git a/core/src/main/java/feign/Retryer.java b/core/src/main/java/feign/Retryer.java
@@ -73,6 +73,7 @@ public void continueOrPropagate(RetryableException e) {
         Thread.sleep(interval);
       } catch (InterruptedException ignored) {
         Thread.currentThread().interrupt();
+        throw e;
       }
       sleptForMillis += interval;
     }
diff --git a/core/src/test/java/feign/RetryerTest.java b/core/src/test/java/feign/RetryerTest.java
@@ -13,6 +13,7 @@
  */
 package feign;
 
+import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -72,4 +73,21 @@ protected long currentTimeMillis() {
   public void neverRetryAlwaysPropagates() {
     Retryer.NEVER_RETRY.continueOrPropagate(new RetryableException(null, null, new Date(5000)));
   }
+
+  @Test
+  public void defaultRetryerFailsOnInterruptedException() {
+    Default retryer = new Retryer.Default();
+
+    Thread.currentThread().interrupt();
+    RetryableException expected = new RetryableException(null, null, new Date(System.currentTimeMillis() + 5000));
+    try {
+      retryer.continueOrPropagate(expected);
+      Thread.interrupted(); // reset interrupted flag in case it wasn't
+      Assert.fail("Retryer continued despite interruption");
+    } catch (RetryableException e) {
+      Assert.assertTrue("Interrupted status not reset", Thread.interrupted());
+      Assert.assertEquals("Retry attempt not registered as expected", 2, retryer.attempt);
+      Assert.assertEquals("Unexpected exception found", expected, e);
+    }
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ public void continueOrPropagate(RetryableException e) {`
`73`	`73`	`Thread.sleep(interval);`
`74`	`74`	`} catch (InterruptedException ignored) {`
`75`	`75`	`Thread.currentThread().interrupt();`
	`76`	`+ throw e;`
`76`	`77`	`}`
`77`	`78`	`sleptForMillis += interval;`
`78`	`79`	`}`