MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-91884 - NPE: XmlDocumentImpl.getDefaultNSDescriptorInner

Browse Source
This commit is contained in:
Dmitry Avdeev
2017-09-19 15:06:00 +03:00
parent d563f2255d
commit b68bab3c58
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java
+6 -3
View File
@@ -166,6 +166,7 @@ public class XmlDocumentImpl extends XmlElementImpl implements XmlDocument {
super.clearCaches();
}
@Nullable
@Override
public XmlNSDescriptor getDefaultNSDescriptor(final String namespace, final boolean strict) {
long curExtResourcesModCount = ExternalResourceManagerEx.getInstanceEx().getModificationCount(getProject());
@@ -233,9 +234,11 @@ public class XmlDocumentImpl extends XmlElementImpl implements XmlDocument {
}
nsDescriptor = getDefaultNSDescriptor(htmlns, false);
}
final XmlFile descriptorFile = nsDescriptor.getDescriptorFile();
if (descriptorFile != null) {
return getCachedHtmlNsDescriptor(descriptorFile);
if (nsDescriptor != null) {
final XmlFile descriptorFile = nsDescriptor.getDescriptorFile();
if (descriptorFile != null) {
return getCachedHtmlNsDescriptor(descriptorFile);
}
}
return new HtmlNSDescriptorImpl(nsDescriptor);
}