From 976c6ca6248ccb6cbb60042bd0e703dbef8569e7 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 20 Mar 2012 13:49:24 +0100
Subject: [PATCH] EA-33002 - NPE: ModuleAttachProcessor.attachToProject

---
 .../intellij/platform/ModuleAttachProcessor.java  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/platform/ModuleAttachProcessor.java b/platform/lang-impl/src/com/intellij/platform/ModuleAttachProcessor.java
index 90bd69e50224..e1768278e035 100644
--- a/platform/lang-impl/src/com/intellij/platform/ModuleAttachProcessor.java
+++ b/platform/lang-impl/src/com/intellij/platform/ModuleAttachProcessor.java
@@ -70,12 +70,15 @@ public class ModuleAttachProcessor extends ProjectAttachProcessor {
         token.finish();
       }
     }
-    for(String file: projectDir.list()) {
-      if (FileUtil.getExtension(file).equals("iml")) {
-        VirtualFile imlFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(projectDir, file));
-        if (imlFile != null) {
-          attachModule(project, imlFile, callback);
-          return true;
+    final String[] files = projectDir.list();
+    if (files != null) {
+      for(String file: files) {
+        if (FileUtil.getExtension(file).equals("iml")) {
+          VirtualFile imlFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(projectDir, file));
+          if (imlFile != null) {
+            attachModule(project, imlFile, callback);
+            return true;
+          }
         }
       }
     }