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 {