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

inference: ensure thread local is cleared after calculation

Browse Source
This commit is contained in:
Anna Kozlova
2015-05-25 16:52:12 +02:00
parent acc536795d
commit 007fd699c5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java
+9 -7
View File
@@ -157,16 +157,17 @@ public class MethodCandidateInfo extends CandidateInfo{
map = ContainerUtil.createConcurrentWeakMap();
CURRENT_CANDIDATE.set(map);
}
final CurrentCandidateProperties alreadyThere = map.put(getMarkerList(),
final PsiElement argumentList = getMarkerList();
final CurrentCandidateProperties alreadyThere = map.put(argumentList,
new CurrentCandidateProperties(this, substitutor, isVarargs(), true));
try {
return computable.compute();
}
finally {
if (alreadyThere == null) {
map.remove(getMarkerList());
map.remove(argumentList);
} else {
map.put(getMarkerList(), alreadyThere);
map.put(argumentList, alreadyThere);
}
}
}
@@ -286,8 +287,9 @@ public class MethodCandidateInfo extends CandidateInfo{
CURRENT_CANDIDATE.set(map);
}
final PsiMethod method = getElement();
final CurrentCandidateProperties alreadyThere =
map.put(getMarkerList(), new CurrentCandidateProperties(this, super.getSubstitutor(), policy.isVarargsIgnored() || isVarargs(), !includeReturnConstraint));
final PsiElement argumentList = getMarkerList();
final CurrentCandidateProperties alreadyThere =
map.put(argumentList, new CurrentCandidateProperties(this, super.getSubstitutor(), policy.isVarargsIgnored() || isVarargs(), !includeReturnConstraint));
try {
PsiTypeParameter[] typeParameters = method.getTypeParameters();
@@ -309,9 +311,9 @@ public class MethodCandidateInfo extends CandidateInfo{
}
finally {
if (alreadyThere == null) {
map.remove(getMarkerList());
map.remove(argumentList);
} else {
map.put(getMarkerList(), alreadyThere);
map.put(argumentList, alreadyThere);
}
}
}