Merge fix

Author: novalisdenahi

src/main/java/com/configcat/ConfigFetcher.java

@@ -223,8 +223,8 @@ private CompletableFuture<FetchResponse> fetchWithRetryAsync(final String eTag)
         return this.getResponseAsync(eTag, requestId).thenComposeAsync(response -> {
             if (response.shouldRetry()) {
                 try {
-                    long now = System.currentTimeMillis();
-                    if (lastEvictAllTimestamp == 0 || (now - lastEvictAllTimestamp) >= EVICT_ALL_THRESHOLD_NS) {
+                    long now = System.nanoTime();
+                    if (lastEvictAllTimestamp == Long.MIN_VALUE || (now - lastEvictAllTimestamp) >= EVICT_ALL_THRESHOLD_NS) {
                         this.httpClient.connectionPool().evictAll();
                         lastEvictAllTimestamp = now;
                         if (isDebugLoggingEnabled){

src/test/java/com/configcat/ConfigFetcherTest.java

@@ -20,7 +20,6 @@
 import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
-import java.lang.reflect.Field;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
@@ -435,7 +434,7 @@ public void evictAllThrottledWithin30Seconds() throws Exception {
                 "", this.server.url("/").toString(), false, PollingModes.manualPoll().getPollingIdentifier());
 
         // First fetch: evictAll should be called, timestamp set
-        assertEquals(0, getLastEvictAllTimestampWithReflection(fetcher));
+        assertEquals(Long.MIN_VALUE, getLastEvictAllTimestampWithReflection(fetcher));
         FetchResponse response1 = fetcher.fetchAsync(null).get();
         assertTrue(response1.isFetched());
         long firstTimestamp = getLastEvictAllTimestampWithReflection(fetcher);