NPE

diff --git a/java/java-impl/src/com/intellij/slicer/SliceUtil.java b/java/java-impl/src/com/intellij/slicer/SliceUtil.java
index fef3a5487f3d14b2282f12024c3df81a634db7d0..7080ea7a034cef74c6658b0d6eb90776b2b71806 100644 (file)
--- a/java/java-impl/src/com/intellij/slicer/SliceUtil.java
+++ b/java/java-impl/src/com/intellij/slicer/SliceUtil.java
@@ -168,8 +168,9 @@ public class SliceUtil {
       final PsiCodeBlock body = override.getBody();
       if (body == null) continue;
 
-      final PsiSubstitutor superSubstitutor = methodCalled == override ? substitutor :
+      final PsiSubstitutor s = methodCalled == override ? substitutor :
         MethodSignatureUtil.getSuperMethodSignatureSubstitutor(methodCalled.getSignature(substitutor), override.getSignature(substitutor));
+      final PsiSubstitutor superSubstitutor = s == null ? parentSubstitutor : s;
 
       body.accept(new JavaRecursiveElementWalkingVisitor() {
         @Override