MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-26 00:11:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed race condition in new cache in BaseExternalAnnotationsManager.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-08-06 16:06:02 +04:00
parent 7d8424329b
commit b4265fdf08
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java
+7 -6
View File
@@ -17,6 +17,7 @@ package com.intellij.codeInsight;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.StreamUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -120,17 +121,17 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations
return map;
}
protected Map<PsiFile, MultiMap<String, AnnotationData>> annotationsFileToData = new HashMap<PsiFile, MultiMap<String, AnnotationData>>();
protected Map<PsiFile, Long> annotationsFileToModificationStamp = new HashMap<PsiFile, Long>();
protected ConcurrentMap<PsiFile, Pair<MultiMap<String, AnnotationData>, Long>> annotationsFileToDataAndModificationStamp
= new ConcurrentWeakHashMap<PsiFile, Pair<MultiMap<String, AnnotationData>, Long>>();
@NotNull
private MultiMap<String, AnnotationData> getDataFromFile(@NotNull PsiFile file) {
if (annotationsFileToData.containsKey(file) && file.getModificationStamp() == annotationsFileToModificationStamp.get(file)) {
return annotationsFileToData.get(file);
Pair<MultiMap<String, AnnotationData>, Long> cached = annotationsFileToDataAndModificationStamp.get(file);
if (cached != null && cached.getSecond() == file.getModificationStamp()) {
return cached.getFirst();
}
else {
MultiMap<String, AnnotationData> data = new MultiMap<String, AnnotationData>();
annotationsFileToData.put(file, data);
annotationsFileToModificationStamp.put(file, file.getModificationStamp());
annotationsFileToDataAndModificationStamp.put(file, Pair.create(data, file.getModificationStamp()));
Document document;
try {