Merge pull request #16749 from stuartwdouglas/minor-ct-fix

Minor continous testing fix
quarkusio · Apr 26, 2021 · 6aaa9c6 · 6aaa9c6
2 parents ed1e899 + 6348062
commit 6aaa9c6
Showing 1 changed file with 4 additions and 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
@@ -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);
                 }
             }
         }