UP-4046 Recursive conflict resolution for:PsiMethod:collect

More information about problem context
This commit is contained in:
Denis Zhdanov
2015-05-20 09:07:39 +03:00
parent 47ea2ff73e
commit 1ab691df8e
@@ -73,7 +73,9 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
public final CandidateInfo resolveConflict(@NotNull final List<CandidateInfo> conflicts){
final MethodCandidateInfo.CurrentCandidateProperties properties = MethodCandidateInfo.getCurrentMethod(myArgumentsList);
if (properties != null) {
LOG.error("Recursive conflict resolution for:" + properties.getMethod() + "; " + myArgumentsList.getText());
final PsiMethod method = properties.getMethod();
LOG.error("Recursive conflict resolution for:" + method + "; " + myArgumentsList.getText() + "; file="
+ (method == null ? "<unknown>" : method.getContainingFile()));
}
return MethodCandidateInfo.ourOverloadGuard.doPreventingRecursion(myArgumentsList, true, new Computable<CandidateInfo>() {
@Override