Fix delays between manually triggered async execution retries.

Fixes #242.

Author: jhalterman

src/main/java/net/jodah/failsafe/AbstractExecution.java

@@ -42,7 +42,7 @@ public abstract class AbstractExecution extends ExecutionContext {
   /* Whether the execution has been interrupted */
   volatile boolean interrupted;
   /* The wait time in nanoseconds. */
-  private volatile long waitNanos;
+  volatile long waitNanos;
   /* Whether the execution has been completed */
   volatile boolean completed;
 

src/main/java/net/jodah/failsafe/AsyncExecution.java

@@ -196,7 +196,7 @@ void executeAsync(boolean asyncExecution) {
    */
   boolean completeOrHandle(Object result, Throwable failure) {
     synchronized (future) {
-      ExecutionResult er = new ExecutionResult(result, failure);
+      ExecutionResult er = new ExecutionResult(result, failure).withWaitNanos(waitNanos);
       if (!completeCalled)
         record(er);
       completeCalled = true;

src/main/java/net/jodah/failsafe/ExecutionResult.java

@@ -100,8 +100,8 @@ public boolean isSuccess() {
   }
 
   /**
-   * Returns a copy of the ExecutionResult with a non-result, and completed and success set to true. Returns
-   * {@code this} if {@link #success} and {@link #result} are unchanged.
+   * Returns a copy of the ExecutionResult with a non-result, and completed and success set to true. Returns {@code
+   * this} if {@link #success} and {@link #result} are unchanged.
    */
   ExecutionResult withNonResult() {
     return success && this.result == null && nonResult ?
@@ -136,6 +136,15 @@ ExecutionResult with(boolean completed, boolean success) {
         successAll == null ? success : success && successAll);
   }
 
+  /**
+   * Returns a copy of the ExecutionResult with the {@code waitNanos} value.
+   */
+  public ExecutionResult withWaitNanos(long waitNanos) {
+    return this.waitNanos == waitNanos ?
+      this :
+      new ExecutionResult(result, failure, nonResult, waitNanos, complete, success, successAll);
+  }
+
   /**
    * Returns a copy of the ExecutionResult with the {@code waitNanos}, {@code completed} and {@code success} values.
    */

src/test/java/net/jodah/failsafe/issues/Issue242Test.java

@@ -0,0 +1,25 @@
+package net.jodah.failsafe.issues;
+
+import net.jodah.failsafe.Failsafe;
+import net.jodah.failsafe.RetryPolicy;
+import org.testng.annotations.Test;
+
+import java.time.Duration;
+
+import static org.testng.Assert.assertTrue;
+
+@Test
+public class Issue242Test {
+  public void test() throws Throwable {
+    RetryPolicy<String> retryPolicy = new RetryPolicy<String>().handleResult(null)
+      .withDelay(Duration.ofMillis(100))
+      .withMaxAttempts(3);
+
+    long startTime = System.currentTimeMillis();
+    Failsafe.with(retryPolicy).runAsyncExecution(exec -> {
+      if (!exec.complete(null, null))
+        exec.retry();
+    }).get();
+    assertTrue(System.currentTimeMillis() - startTime > 200, "Expected delay between retries");
+  }
+}