Skip to content

Commit

Permalink
Minor continous testing fix
Browse files Browse the repository at this point in the history
This could cause issues if a dev mode
restart and CT scan happened at the
same time.
  • Loading branch information
stuartwdouglas committed Apr 25, 2021
1 parent c5d116a commit 6348062
Showing 1 changed file with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
}
}
}
Expand Down

0 comments on commit 6348062

Please sign in to comment.