@@ -1,3 +1,8 @@
+### Version 8.4
+* Correct Retryer bug that prevented it from retrying requests after the first 5 retry attempts.
+  * **Note:** If you have a custom `feign.Retryer` implementation you now must now implement `public Retryer clone()`.
+  It is suggested that you simply return a new instance of your Retryer class.
+
 ### Version 8.3
 * Adds client implementation for Apache Http Client 
 
 
@@ -18,23 +18,26 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 /**
- * Created for each invocation to {@link Client#execute(Request, feign.Request.Options)}.
+ * Cloned for each invocation to {@link Client#execute(Request, feign.Request.Options)}.
  * Implementations may keep state to determine if retry operations should continue or not.
  */
-public interface Retryer {
+public interface Retryer extends Cloneable {
 
   /**
    * if retry is permitted, return (possibly after sleeping). Otherwise propagate the exception.
    */
   void continueOrPropagate(RetryableException e);
 
+  Retryer clone();
+
   public static class Default implements Retryer {
 
     private final int maxAttempts;
     private final long period;
     private final long maxPeriod;
     int attempt;
     long sleptForMillis;
+
     public Default() {
       this(100, SECONDS.toMillis(1), 5);
     }
@@ -87,5 +90,10 @@ long nextMaxInterval() {
       long interval = (long) (period * Math.pow(1.5, attempt - 1));
       return interval > maxPeriod ? maxPeriod : interval;
     }
+
+    @Override
+    public Retryer clone() {
+      return new Default(period, maxPeriod, maxAttempts);
+    }
   }
 }
@@ -65,7 +65,7 @@ private SynchronousMethodHandler(Target<?> target, Client client, Retryer retrye
   @Override
   public Object invoke(Object[] argv) throws Throwable {
     RequestTemplate template = buildTemplateFromArgs.create(argv);
-    Retryer retryer = this.retryer;
+    Retryer retryer = this.retryer.clone();
     while (true) {
       try {
         return executeAndDecode(template);
 
@@ -301,6 +301,50 @@ public Object decode(Response response, Type type) throws IOException {
     api.post();
   }
 
+  @Test
+  public void ensureRetryerClonesItself() {
+    server.enqueue(new MockResponse().setResponseCode(503).setBody("foo 1"));
+    server.enqueue(new MockResponse().setResponseCode(200).setBody("foo 2"));
+    server.enqueue(new MockResponse().setResponseCode(503).setBody("foo 3"));
+    server.enqueue(new MockResponse().setResponseCode(200).setBody("foo 4"));
+
+    MockRetryer retryer = new MockRetryer();
+
+    TestInterface api = Feign.builder()
+      .retryer(retryer)
+      .errorDecoder(new ErrorDecoder()
+      {
+        @Override
+        public Exception decode(String methodKey, Response response)
+        {
+          return new RetryableException("play it again sam!", null);
+        }
+      }).target(TestInterface.class, "http://localhost:" + server.getPort());
+
+    api.response();
+    api.response(); // if retryer instance was reused, this statement will throw an exception
+    assertEquals(4, server.getRequestCount());
+  }
+
+  private static class MockRetryer implements Retryer
+  {
+    boolean tripped;
+
+    @Override
+    public void continueOrPropagate(RetryableException e) {
+      if (tripped) {
+        throw new RuntimeException("retryer instance should never be reused");
+      }
+      tripped = true;
+      return;
+    }
+
+    @Override
+    public Retryer clone() {
+        return new MockRetryer();
+    }
+  }
+
   @Test
   public void okIfDecodeRootCauseHasNoMessage() throws Exception {
     server.enqueue(new MockResponse().setBody("success!"));
 
@@ -214,6 +214,9 @@ public void unknownHostEmits() throws IOException, InterruptedException {
             public void continueOrPropagate(RetryableException e) {
               throw e;
             }
+            @Override public Retryer clone() {
+                return this;
+            }
           })
           .target(SendsStuff.class, "http://robofu.abc");
 
@@ -264,6 +267,11 @@ public void continueOrPropagate(RetryableException e) {
               }
               throw e;
             }
+
+            @Override
+            public Retryer clone() {
+                return this;
+            }
           })
           .target(SendsStuff.class, "http://robofu.abc");
Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,9 @@ public void unknownHostEmits() throws IOException, InterruptedException {`
`214`	`214`	`public void continueOrPropagate(RetryableException e) {`
`215`	`215`	`throw e;`
`216`	`216`	`}`
	`217`	`+ @Override public Retryer clone() {`
	`218`	`+ return this;`
	`219`	`+ }`
`217`	`220`	`})`
`218`	`221`	`.target(SendsStuff.class, "http://robofu.abc");`
`219`	`222`
`@@ -264,6 +267,11 @@ public void continueOrPropagate(RetryableException e) {`
`264`	`267`	`}`
`265`	`268`	`throw e;`
`266`	`269`	`}`
	`270`	`+`
	`271`	`+ @Override`
	`272`	`+ public Retryer clone() {`
	`273`	`+ return this;`
	`274`	`+ }`
`267`	`275`	`})`
`268`	`276`	`.target(SendsStuff.class, "http://robofu.abc");`
`269`	`277`