EA-52505 - NPE: MethodCandidateInfo.getPertinentApplicabilityLevel

This commit is contained in:
anna
2013-11-29 18:24:24 +01:00
parent 17e92966f1
commit 8d22bd8af5
@@ -111,22 +111,24 @@ public class MethodCandidateInfo extends CandidateInfo{
}
else {
final PsiSubstitutor substitutor = getSubstitutor();
level = ourOverloadGuard.doPreventingRecursion(myArgumentList, false, new Computable<Integer>() {
Integer boxedLevel = ourOverloadGuard.doPreventingRecursion(myArgumentList, false, new Computable<Integer>() {
@Override
public Integer compute() {
return PsiUtil.getApplicabilityLevel(getElement(), substitutor, myArgumentTypes, myLanguageLevel);
}
});
level = boxedLevel != null ? boxedLevel : getApplicabilityLevel();
}
if (level > ApplicabilityLevel.NOT_APPLICABLE && !isTypeArgumentsApplicable()) level = ApplicabilityLevel.NOT_APPLICABLE;
return level;
}
return ourOverloadGuard.doPreventingRecursion(myArgumentList, false, new Computable<Integer>() {
Integer boxedLevel = ourOverloadGuard.doPreventingRecursion(myArgumentList, false, new Computable<Integer>() {
@Override
public Integer compute() {
return getApplicabilityLevelInner();
}
});
return boxedLevel != null ? boxedLevel : getApplicabilityLevel();
}
public PsiSubstitutor getSiteSubstitutor() {