Fix QuietPeriodListener swallowing subsequent events (issue #95)

Author: vorburger

src/main/java/ch/vorburger/fswatch/QuietPeriodListener.java

@@ -40,6 +40,9 @@ public class QuietPeriodListener implements Listener {
     protected @Nullable Thread thread;
     protected volatile boolean sleepAgain;
 
+    protected volatile Path lastPath;
+    protected volatile ChangeKind lastChangeKind;
+
     /**
      * Constructor.
      * @param quietPeriodInMS the quiet period in milliseconds
@@ -54,6 +57,8 @@ public QuietPeriodListener(long quietPeriodInMS, Listener listenerToWrap, Except
 
     @Override
     public synchronized void onChange(Path path, ChangeKind changeKind) {
+        this.lastPath = path;
+        this.lastChangeKind = changeKind;
         if (thread != null && thread.isAlive()) {
             sleepAgain = true;
             //System.out.println("sleepAgain = true");
@@ -65,7 +70,7 @@ public synchronized void onChange(Path path, ChangeKind changeKind) {
                         //System.out.println("sleepAgain = false");
                         Thread.sleep(quietPeriodInMS);
                     } while (sleepAgain);
-                    delegate.onChange(path, changeKind);
+                    delegate.onChange(lastPath, lastChangeKind);
                 } catch (Throwable e) {
                     exceptionHandler.onException(e);
                 }
@@ -75,4 +80,4 @@ public synchronized void onChange(Path path, ChangeKind changeKind) {
             thread.start();
         }
     }
-}
+}

src/test/java/ch/vorburger/fswatch/test/DirectoryAndFileWatcherTest.java

@@ -23,6 +23,7 @@
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -234,18 +235,18 @@ public void testOverwriteExistingFile() throws Throwable {
         final File file = File.createTempFile("test", "txt");
         final File to = dir.toPath().resolve("test.txt").toFile();
         Files.copy(file, to);
-        java.util.List<ChangeKind> changes = java.util.Collections.synchronizedList(new java.util.ArrayList<>());
+        AtomicReference<ChangeKind> change = new AtomicReference<>();
 
-        try (DirectoryWatcher dw = new DirectoryWatcherBuilder().path(dir).quietPeriodInMS(0).listener((p, c) -> {
+        try (DirectoryWatcher dw = new DirectoryWatcherBuilder().path(dir).listener((p, c) -> {
             System.out.println("c = " + c);
-            changes.add(c);
+            change.set(c);
         }).exceptionHandler(assertableExceptionHandler).build()) {
             // We want it to call the listener once for setup, even without any change
             assertableExceptionHandler.assertNoErrorInTheBackgroundThread();
             java.nio.file.Files.move(file.toPath(), to.toPath(), REPLACE_EXISTING);
 
 //             Files.move(file, to);
-            await().atMost(5, SECONDS).until(() -> changes.contains(ChangeKind.CREATED) || changes.contains(ChangeKind.MODIFIED));
+            await().atMost(5, SECONDS).until(change::get, anyOf(is(ChangeKind.CREATED), is(ChangeKind.MODIFIED)));
         }
     }