From 4e9e9c973c65cc8228577bcf9e452d610211f40e Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 23 Nov 2015 19:39:03 +0100
Subject: [PATCH] assert no recursive conflict resolution

---
 .../JavaMethodsConflictResolver.java                  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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 8a22ce5ef129..b52561b246cc 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,14 +73,13 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
 
   @Override
   public final CandidateInfo resolveConflict(@NotNull final List<CandidateInfo> conflicts){
-    /*
-    //non-default policies
     final MethodCandidateInfo.CurrentCandidateProperties properties = MethodCandidateInfo.getCurrentMethod(myArgumentsList);
-    if (properties != null) {
+    if (properties != null && properties.isApplicabilityCheck()) {
       final PsiMethod method = properties.getMethod();
-      LOG.error("Recursive conflict resolution for:" + method + "; " + myArgumentsList.getText() + "; file="
-                + (method == null ? "<unknown>" : method.getContainingFile()));
-    }*/
+      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
       public CandidateInfo compute() {