From e5170f8c547057e2d5090efc0cc3a121b057e81c Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 3 Jun 2015 17:13:45 +0200
Subject: [PATCH] JavaOverridingMethodsSearcher: be shorter and more
 explanatory

---
 .../psi/impl/search/JavaOverridingMethodsSearcher.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java
index d8607f69b312..2c539868c471 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java
@@ -73,10 +73,9 @@ public class JavaOverridingMethodsSearcher implements QueryExecutor<PsiMethod, O
 
   @NotNull
   private static MethodSignature getSuperSignature(PsiClass inheritor, @NotNull PsiClass parentClass, PsiMethod method) {
-    PsiSubstitutor substitutor = inheritor.isInheritor(parentClass, true) ?
-                                 TypeConversionUtil.getSuperClassSubstitutor(parentClass, inheritor, PsiSubstitutor.EMPTY) :
-                                 PsiSubstitutor.EMPTY;
-    return method.getSignature(substitutor);
+    PsiSubstitutor substitutor = TypeConversionUtil.getMaybeSuperClassSubstitutor(parentClass, inheritor, PsiSubstitutor.EMPTY, null);
+    // if null, we have EJB custom inheritance here and still check overriding
+    return method.getSignature(substitutor != null ? substitutor : PsiSubstitutor.EMPTY);
   }