From 7bf2db5cb44c11afa293942e33a29365b361a446 Mon Sep 17 00:00:00 2001
From: Evgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Date: Tue, 22 May 2012 12:13:04 +0200
Subject: [PATCH] [yole] fix NRE

---
 .../openapi/vfs/impl/jar/CoreJarHandler.java       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarHandler.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarHandler.java
index eb43306a8f80..752e80e502a8 100644
--- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarHandler.java
+++ b/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarHandler.java
@@ -37,16 +37,12 @@ public class CoreJarHandler extends JarHandlerBase {
     Map<EntryInfo, CoreJarVirtualFile> entries = new HashMap<EntryInfo, CoreJarVirtualFile>();
 
     final Map<String, EntryInfo> entriesMap = getEntriesMap();
-    if (entriesMap != null) {
-      for (EntryInfo info : entriesMap.values()) {
-        getOrCreateFile(info, entries);
-      }
+    for (EntryInfo info : entriesMap.values()) {
+      getOrCreateFile(info, entries);
+    }
 
-      myRoot = getOrCreateFile(getEntryInfo(""), entries);
-    }
-    else {
-      myRoot = null;
-    }
+    EntryInfo rootInfo = getEntryInfo("");
+    myRoot = rootInfo != null ? getOrCreateFile(rootInfo, entries) : null;
   }
 
   @NotNull