From 46f36e5a032e4c394d6f06731d0746637cabc3da Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 9 Aug 2010 15:30:34 +0400 Subject: [PATCH] IDEA-56707 NPE at ChangeUtil.copyElement() --- .../src/com/intellij/psi/impl/source/xml/XmlTagImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java index da672c0a6d1c..35a1a8754cae 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java @@ -24,7 +24,6 @@ import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.progress.ProgressManager; -import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.TextRange; @@ -492,8 +491,10 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag { ChangeUtil.copyElement((TreeElement)XmlChildRole.START_TAG_NAME_FINDER.findChild(dummyTag), charTableByTree)); final ASTNode childByRole = XmlChildRole.CLOSING_TAG_NAME_FINDER.findChild(tag); if (childByRole != null) { - tag.replaceChild(childByRole, - ChangeUtil.copyElement((TreeElement)XmlChildRole.CLOSING_TAG_NAME_FINDER.findChild(dummyTag), charTableByTree)); + final TreeElement treeElement = (TreeElement)XmlChildRole.CLOSING_TAG_NAME_FINDER.findChild(dummyTag); + if (treeElement != null) { + tag.replaceChild(childByRole, ChangeUtil.copyElement(treeElement, charTableByTree)); + } } return XmlTagNameChangedImpl.createXmlTagNameChanged(model, tag, oldName);