From fe5ef6f03b5e638d7c132106332b62bf288ef528 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 4 Nov 2016 15:58:45 +0100
Subject: [PATCH] EA-90879 - NPE: PsiClassImpl.calcBasesResolveContext

---
 .../src/com/intellij/psi/impl/source/PsiClassImpl.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
index b2b6163fc21a..2de0d95e2d34 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
@@ -557,7 +557,7 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
   }
 
   @Nullable
-  private static PsiElement calcBasesResolveContext(PsiElement scope,
+  private static PsiElement calcBasesResolveContext(@NotNull PsiElement scope,
                                                     String baseClassName,
                                                     boolean isInitialClass,
                                                     final PsiElement defaultResolveContext) {
@@ -591,7 +591,8 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
       return calcBasesResolveContext(psi, baseClassName, false, defaultResolveContext);
     }
     if (psi instanceof PsiMember) {
-      return calcBasesResolveContext(((PsiMember)psi).getContainingClass(), baseClassName, false, defaultResolveContext);
+      PsiClass containingClass = ((PsiMember)psi).getContainingClass();
+      return containingClass != null ? calcBasesResolveContext(containingClass, baseClassName, false, defaultResolveContext) : psi;
     }
     LOG.error(parentStub);
     return psi;