From 7772be6e5429a4e233ae6475ae129164dbb3ac59 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Fri, 14 Sep 2012 11:47:13 +0200
Subject: [PATCH] npe+oom (cherry-picked from 6030b56)

---
 .../src/com/intellij/psi/impl/file/impl/FileManagerImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
index c7cb00668529..216de4634e17 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
@@ -44,6 +44,7 @@ import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.util.ConcurrencyUtil;
 import com.intellij.util.containers.ConcurrentSoftValueHashMap;
 import com.intellij.util.containers.ConcurrentWeakValueHashMap;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.MessageBusConnection;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NotNull;
@@ -416,7 +417,7 @@ public class FileManagerImpl implements FileManager {
     List<PsiFile> files = new ArrayList<PsiFile>();
     for (FileViewProvider provider : myVFileToViewProviderMap.values()) {
       if (provider instanceof SingleRootFileViewProvider) {
-        files.add(((SingleRootFileViewProvider)provider).getCachedPsi(provider.getBaseLanguage()));
+        ContainerUtil.addIfNotNull(files, ((SingleRootFileViewProvider)provider).getCachedPsi(provider.getBaseLanguage()));
       }
     }
     return files;