From 6348062c9db6bd8e8e860b98f8754b80a9b06bc0 Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Fri, 23 Apr 2021 15:42:09 +1000
Subject: [PATCH] Minor continous testing fix

This could cause issues if a dev mode
restart and CT scan happened at the
same time.
---
 .../io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
index 8b5570c5a73d6..b1925b536c768 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
@@ -451,7 +451,9 @@ public Set<String> syncState(Map<String, String> fileHashes) {
 
     ClassScanResult checkForChangedClasses(boolean firstScan) {
         ClassScanResult classScanResult = checkForChangedClasses(compiler, DevModeContext.ModuleInfo::getMain, firstScan, main);
-        test.merge(main);
+        if (firstScan) {
+            test.merge(main);
+        }
         return classScanResult;
     }
 
@@ -819,8 +821,8 @@ public RuntimeUpdatesProcessor setWatchedFilePaths(Map<String, Boolean> watchedF
                     }
                     if (includeTest) {
                         test.watchedFileTimestamps.put(config, 0L);
-                        main.watchedFileTimestamps.putAll(extraWatchedFileTimestamps);
                     }
+                    main.watchedFileTimestamps.putAll(extraWatchedFileTimestamps);
                 }
             }
         }