From 5dc3cd81c646f03dc1effa12680cd1af4282e840 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 14 Sep 2011 11:56:21 +0200
Subject: [PATCH] Fix NPE in plugin manager

---
 .../src/com/intellij/ide/plugins/PluginManager.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
index 5986cb85b4b4..d5fb7545f090 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
@@ -204,7 +204,7 @@ public class PluginManager {
     }
   }
 
-  private static void initializePlugins(StartupProgress progress) {
+  private static void initializePlugins(@Nullable StartupProgress progress) {
     configureExtensions();
     
     final IdeaPluginDescriptorImpl[] pluginDescriptors = loadDescriptors(progress);
@@ -271,7 +271,9 @@ public class PluginManager {
       }
 
       pluginDescriptor.registerExtensions();
-      progress.showProgress("", 0.5f + (i++/(float )result.size()) * 0.25f);
+      if (progress != null) {
+        progress.showProgress("", 0.5f + (i++ / (float)result.size()) * 0.25f);
+      }
     }
 
     ourPlugins = pluginDescriptors;