From 1ab691df8eac3ee69e08040f155af16ed52ae292 Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <denis.zhdanov@jetbrains.com>
Date: Tue, 19 May 2015 15:03:34 +0300
Subject: [PATCH] UP-4046 Recursive conflict resolution for:PsiMethod:collect

More information about problem context
---
 .../scope/conflictResolvers/JavaMethodsConflictResolver.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
index 823cbe266271..1fca3e49a4eb 100644
--- a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
+++ b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
@@ -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