From 9ec6bd1c9f1ccddd2b9228a55e1c386e03b615a3 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 21 Mar 2012 18:57:53 +0100
Subject: [PATCH] avoid race condition when calling isValid during stub-ast
 switching

---
 .../core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java | 2 +-
 1 file changed, 1 insertion(+), 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 0315ce57d355..b7e395dcc6ce 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
@@ -253,7 +253,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
     synchronized (myStubLock) {
       StubTree fileStub = derefStub();
       StubElement childStub = child.getStub();
-      if (fileStub == null || childStub != null && fileStub.getRoot() != childStub.getParentStub()) {
+      if (childStub != null && (fileStub == null || fileStub.getRoot() != childStub.getParentStub())) {
         return false;
       }
     }