From e887fa4385eebf61e3a81d45659461d414ff7cd7 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 31 Aug 2012 17:32:26 +0400
Subject: [PATCH] diagnostics for EA-37923 - NPE: XmlUtil.getCharFromEntityRef

---
 .../src/com/intellij/psi/impl/source/xml/XmlTextImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java
index 795fbcf0f23f..05d1446a8154 100644
--- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java
@@ -97,7 +97,9 @@ public class XmlTextImpl extends XmlElementImpl implements XmlText, PsiLanguageI
         child = cdata.getFirstChildNode();
       }
       else if (elementType == XmlTokenType.XML_CHAR_ENTITY_REF) {
-        buffer.append(XmlUtil.getCharFromEntityRef(child.getText()));
+        String text = child.getText();
+        LOG.assertTrue(text != null, child);
+        buffer.append(XmlUtil.getCharFromEntityRef(text));
       }
       else if (elementType == XmlTokenType.XML_WHITE_SPACE || elementType == XmlTokenType.XML_DATA_CHARACTERS || elementType == XmlTokenType
         .XML_ATTRIBUTE_VALUE_TOKEN) {