Dispose snapshot synchronized to prevent from some problem caused by …

…data inconsistency.
eclipse-jifa · Nov 27, 2023 · ae6f090 · ae6f090
1 parent dbf5e4b
commit ae6f090
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/analysis/src/main/java/org/eclipse/jifa/analysis/AbstractApiExecutor.java b/analysis/src/main/java/org/eclipse/jifa/analysis/AbstractApiExecutor.java
@@ -331,11 +331,11 @@ public Progress progressOfAnalysis(@ApiParameterMeta(targetPath = true) Path tar
     }
 
     public void release(@ApiParameterMeta(targetPath = true) Path target) {
-        cachedAnalyzer.invalidate(target);
+        cleanAndDisposeAnalyzerCache(target);
     }
 
     public void clean(@ApiParameterMeta(targetPath = true) Path target) {
-        cachedAnalyzer.invalidate(target);
+        cleanAndDisposeAnalyzerCache(target);
         File errorLog = errorLogFile(target);
         if (errorLog.exists()) {
             if (!errorLog.delete()) {
@@ -355,4 +355,13 @@ protected File errorLogFile(Path path) {
     protected final boolean isActive(Path target) {
         return cachedAnalyzer.getIfPresent(target) != null || buildingAnalyzer.containsKey(target);
     }
+
+    private void cleanAndDisposeAnalyzerCache(Path target) {
+        // Dispose snapshot synchronized to prevent from some problem caused by data inconsistency.
+        Analyzer analyzer = cachedAnalyzer.getIfPresent(target);
+        cachedAnalyzer.invalidate(target);
+        if (analyzer != null) {
+            cachedAnalyzerRemoved(analyzer);
+        }
+    }
 }