EA-21359 - NPE: MultiMap.putAllValues

This commit is contained in:
peter
2010-08-07 23:01:15 +01:00
parent 69e9b92470
commit 30f325c0bb
@@ -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));