From 4b6dc4b4745c55b73415783c78e88ce703a05807 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Fri, 12 Feb 2010 18:14:36 +0300 Subject: [PATCH] NPE fix --- xml/impl/src/com/intellij/xml/util/XmlIconProvider.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java b/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java index badb009d93..e2dfba741e 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java +++ b/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java @@ -18,6 +18,7 @@ package com.intellij.xml.util; import com.intellij.ide.IconProvider; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.util.IconLoader; +import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.xml.XmlFile; import org.jetbrains.annotations.NonNls; @@ -38,9 +39,12 @@ public class XmlIconProvider extends IconProvider implements DumbAware { @Nullable public Icon getIcon(@NotNull final PsiElement element, final int flags) { if (element instanceof XmlFile) { - final String extension = ((XmlFile)element).getVirtualFile().getExtension(); - if(XSD_FILE_EXTENSION.equals(extension)) return ourXsdIcon; - if(WSDL_FILE_EXTENSION.equals(extension)) return ourWsdlIcon; + final VirtualFile vf = ((XmlFile)element).getVirtualFile(); + if (vf != null) { + final String extension = vf.getExtension(); + if (XSD_FILE_EXTENSION.equals(extension)) return ourXsdIcon; + if (WSDL_FILE_EXTENSION.equals(extension)) return ourWsdlIcon; + } } return null; } -- 2.11.4.GIT