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

race condition

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-04-08 14:05:38 +04:00
parent a8a4d2988f
commit ddf7204efb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/containers/ContainerUtil.java
+1 -1
View File
@@ -889,7 +889,7 @@ public class ContainerUtil {
return value;
}
public static <T, V> V getOrCreate(final Map<T, V> result, final T key, final Factory<V> factory) {
public static <T, V> V getOrCreate(@NotNull Map<T, V> result, final T key, @NotNull Factory<V> factory) {
V value = result.get(key);
if (value == null) {
result.put(key, value = factory.create());
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/DefinitionResolver.java
+13 -13
View File
@@ -51,8 +51,8 @@ public class DefinitionResolver extends CommonElement.Visitor implements
private static final Key<CachedValue<Map<String, Set<Define>>>> KEY = Key.create("CACHED_DEFINES");
private THashSet<PsiFile> myVisitedFiles;
private Map<String, Set<Define>> myDefines;
private static final ThreadLocal<Set<PsiFile>> myVisitedFiles = new ThreadLocal<Set<PsiFile>>();
private static final ThreadLocal<Map<String, Set<Define>>> myDefines = new ThreadLocal<Map<String, Set<Define>>>();
private final Grammar myScope;
@@ -65,11 +65,11 @@ public class DefinitionResolver extends CommonElement.Visitor implements
include.acceptChildren(this);
final PsiFile value = include.getInclude();
if (myVisitedFiles == null) {
if (myVisitedFiles.get() == null) {
//noinspection unchecked
myVisitedFiles = new THashSet<PsiFile>(TObjectHashingStrategy.IDENTITY);
myVisitedFiles.set(new THashSet<PsiFile>(TObjectHashingStrategy.IDENTITY));
}
if (value != null && myVisitedFiles.add(value)) {
if (value != null && myVisitedFiles.get().add(value)) {
if (value instanceof RncFile) {
final Grammar grammar = ((RncFile)value).getGrammar();
if (grammar != null) {
@@ -92,7 +92,7 @@ public class DefinitionResolver extends CommonElement.Visitor implements
@Override
public void visitDefine(Define def) {
ContainerUtil.getOrCreate(myDefines, def.getName(), this).add(def);
ContainerUtil.getOrCreate(myDefines.get(), def.getName(), this).add(def);
}
public void visitPattern(Pattern pattern) {
@@ -110,7 +110,7 @@ public class DefinitionResolver extends CommonElement.Visitor implements
}
public Result<Map<String, Set<Define>>> compute() {
myDefines = new HashMap<String, Set<Define>>();
myDefines.set(new HashMap<String, Set<Define>>());
myScope.acceptChildren(this);
@@ -121,15 +121,15 @@ public class DefinitionResolver extends CommonElement.Visitor implements
}
final PsiFile file = psiElement.getContainingFile();
if (myVisitedFiles != null) {
myVisitedFiles.add(file);
return Result.create(myDefines, myVisitedFiles.toArray());
if (myVisitedFiles.get() != null) {
myVisitedFiles.get().add(file);
return Result.create(myDefines.get(), myVisitedFiles.get().toArray());
} else {
return Result.create(myDefines, file);
return Result.create(myDefines.get(), file);
}
} finally {
myVisitedFiles = null;
myDefines = null;
myVisitedFiles.set(null);
myDefines.set(null);
}
}