From 3b4e77dd5e755a69bd36a388730037fc2614b154 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 21 Nov 2014 13:32:53 +0100
Subject: [PATCH] EA-62714 - CCE: DuplicateConflictResolver.resolveConflict

---
 .../psi/scope/conflictResolvers/DuplicateConflictResolver.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java
index 32ac894db204..11b658a9b68d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java
+++ b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java
@@ -47,7 +47,7 @@ public class DuplicateConflictResolver implements PsiConflictResolver{
     for (CandidateInfo info : conflicts) {
       final PsiElement element = info.getElement();
       Object key;
-      if (element instanceof PsiMethod) {
+      if (info instanceof MethodCandidateInfo) {
         key = ((PsiMethod)element).getSignature(((MethodCandidateInfo)info).getSubstitutor(false));
       }
       else {