From 36b9b7886a41b4a3cc6e52a6bf6484829f5d5c8c Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Tue, 5 May 2015 11:43:09 +0200
Subject: [PATCH] use cache value out of PsiLock, part of ( IDEA-139921)

---
 .../src/com/intellij/xml/util/XmlPsiUtil.java          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlPsiUtil.java b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlPsiUtil.java
index 9f2453e0b515..ec774839f839 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlPsiUtil.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlPsiUtil.java
@@ -213,8 +213,9 @@ public class XmlPsiUtil {
                                             final PsiFile targetFile,
                                             final XmlEntityDecl.EntityContextType type,
                                             final XmlEntityRef entityRef) {
+    CachedValue<PsiElement> value;
     synchronized (PsiLock.LOCK) { // we depend on targetFile and entityRef
-      CachedValue<PsiElement> value = entityRef.getUserData(PARSED_DECL_KEY);
+      value = entityRef.getUserData(PARSED_DECL_KEY);
       //    return entityDecl.parse(targetFile, type);
 
       if (value == null) {
@@ -229,11 +230,8 @@ public class XmlPsiUtil {
         }, false);
         entityRef.putUserData(PARSED_DECL_KEY, value);
       }
-
-      return value.getValue();
     }
+
+    return value.getValue();
   }
-
-
-
 }