From fcff21d17f27823f1a06d145bc8a1099e9455890 Mon Sep 17 00:00:00 2001
From: sweinreuter <sascha.weinreuter@gmail.com>
Date: Wed, 10 Nov 2010 12:35:12 +0100
Subject: [PATCH] avoid null keys in indices

---
 .../plugins/relaxNG/model/resolve/RelaxSymbolIndex.java    | 7 +++++--
 .../org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java b/plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java
index 2f198f753b72..5b0797666832 100644
--- a/plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java
+++ b/plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java
@@ -88,7 +88,7 @@ public class RelaxSymbolIndex extends ScalarIndexExtension<String> {
                   attributeHandler = new NanoXmlUtil.IXMLBuilderAdapter() {
                     @Override
                     public void addAttribute(String key, String nsPrefix, String nsURI, String value, String type) throws Exception {
-                      if ("name".equals(key) && (nsURI == null || nsURI.length() == 0)) {
+                      if ("name".equals(key) && (nsURI == null || nsURI.length() == 0) && value != null) {
                         map.put(value, null);
                       }
                     }
@@ -112,7 +112,10 @@ public class RelaxSymbolIndex extends ScalarIndexExtension<String> {
               grammar.acceptChildren(new CommonElement.Visitor() {
                 @Override
                 public void visitDefine(Define define) {
-                  map.put(define.getName(), null);
+                  final String name = define.getName();
+                  if (name != null) {
+                    map.put(name, null);
+                  }
                 }
               });
             }
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java
index a6f7a518c616..0619a641db7b 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java
@@ -181,7 +181,7 @@ public class XsltSymbolIndex extends FileBasedIndexExtension<String, XsltSymbolI
 
         @Override
         public void addAttribute(String key, String nsPrefix, String nsURI, String value, String type) throws Exception {
-            if (key.equals("name") && (nsURI == null || nsURI.length() == 0)) {
+            if (key.equals("name") && (nsURI == null || nsURI.length() == 0) && value != null) {
                 if (myMap.put(value, myKind) != null) {
                     myMap.put(value, Kind.ANYTHING);
                 }