From 8542da151005e38888eb3cfceb09818faedbf857 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 2 Oct 2013 14:27:41 +0200 Subject: [PATCH] prevent NPE after stub-ast mismatch cleanup (EA-38568) --- .../src/com/intellij/psi/impl/source/PsiFileImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java index 66db312436e3..7c883dc0207a 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java @@ -387,7 +387,8 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF } private void clearStub() { - StubTree stubHolder = myStub == null ? null : myStub.get(); + SoftReference stubRef = myStub; + StubTree stubHolder = stubRef == null ? null : stubRef.get(); if (stubHolder != null) { ((StubBase)stubHolder.getRoot()).setPsi(null); }