From 30f325c0bb62eebf96a2017f3f9ccc437255a094 Mon Sep 17 00:00:00 2001
From: peter <peter.gromov@jetbrains.com>
Date: Sat, 7 Aug 2010 20:50:17 +0100
Subject: [PATCH] EA-21359 - NPE: MultiMap.putAllValues

---
 .../com/intellij/psi/impl/search/PsiSearchHelperImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
index 7f244c5d4e98..e35e343c58da 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
@@ -632,6 +632,10 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
     final ProjectFileIndex index = ProjectRootManager.getInstance(myManager.getProject()).getFileIndex();
     final MultiMap<VirtualFile, RequestWithProcessor> result = new MultiMap<VirtualFile, RequestWithProcessor>();
     for (Set<IdIndexEntry> key : singles.keySet()) {
+      if (key.isEmpty()) {
+        continue;
+      }
+
       final Collection<RequestWithProcessor> data = singles.get(key);
       GlobalSearchScope commonScope = uniteScopes(data);
 
@@ -643,7 +647,8 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
         if (first) {
           intersection = local;
           first = false;
-        } else {
+        }
+        else {
           for (VirtualFile file : local.keySet()) {
             if (intersection.containsKey(file)) {
               intersection.putValues(file, local.get(file));