Change the default internal waitNanos for retries to 0

Changes the default internal waitNanos for retries to 0. This is necessary since returning -1 nanos will convert, via TimeUnit, to 0 millis in some JREs, but not all.

Author: jhalterman

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

@@ -37,7 +37,7 @@ class RetryPolicyExecutor extends PolicyExecutor<RetryPolicy> {
   private volatile int failedAttempts;
   private volatile boolean retriesExceeded;
   /** The fixed, backoff, random or computed delay time in nanoseconds. */
-  private volatile long delayNanos = -1;
+  private volatile long delayNanos;
 
   // Listeners
   private final EventListener abortListener;
@@ -221,7 +221,7 @@ private long getFixedOrRandomDelayNanos(long waitNanos) {
     Duration delayMin = policy.getDelayMin();
     Duration delayMax = policy.getDelayMax();
 
-    if (waitNanos == -1 && delay != null && !delay.equals(Duration.ZERO))
+    if (waitNanos == 0 && delay != null && !delay.equals(Duration.ZERO))
       waitNanos = delay.toNanos();
     else if (delayMin != null && delayMax != null)
       waitNanos = randomDelayInRange(delayMin.toNanos(), delayMax.toNanos(), Math.random());

src/test/java/net/jodah/failsafe/AsyncFailsafeTest.java

@@ -539,6 +539,20 @@ public void shouldSkipExecutionWhenCircuitOpen() {
     assertThrows(future::get, ExecutionException.class, CircuitBreakerOpenException.class);
   }
 
+  public void testRetryPolicyScheduledDelayIsZero() throws Throwable {
+    RetryPolicy<Object> rp = new RetryPolicy<>().onRetryScheduled(e -> {
+      assertEquals(e.getDelay().toMillis(), 0);
+      System.out.println(e.getDelay().toMillis());
+      waiter.resume();
+    });
+
+    Failsafe.with(rp).runAsync(() -> {
+      throw new IllegalStateException();
+    });
+
+    waiter.await(1000);
+  }
+
   private void assertInterruptedExceptionOnCancel(FailsafeExecutor<Boolean> failsafe) throws Throwable {
     CompletableFuture<Void> future = failsafe.runAsync(() -> {
       try {