From fb0efdddb4aba1620d70a659c962069b316be84f Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 15 Apr 2014 13:26:13 +0400
Subject: [PATCH] EA-55889 - NPE: NavBarRootPaneExtension$.updateUI

---
 .../ide/navigationToolbar/NavBarRootPaneExtension.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
index d92f4aec742b..2174e7f54f76 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
@@ -174,7 +174,7 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
       AnAction firstAction = null;
       for (final AnAction action : ((DefaultActionGroup)group).getChildActionsOrStubs()) {
         if (action instanceof DefaultActionGroup) {
-          firstAction = getFirstAction((DefaultActionGroup)action);
+          firstAction = getFirstAction(action);
         }
         else if (action instanceof Separator || action instanceof ActionGroup) {
           continue;
@@ -241,13 +241,15 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
       @Override
       public void updateUI() {
         super.updateUI();
+        setOpaque(true);
+        if (myScrollPane == null || myNavigationBar == null) return;
+
         myScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
         myScrollPane.setHorizontalScrollBar(null);
         myScrollPane.setBorder(new NavBarBorder(true, 0));
         myScrollPane.setOpaque(false);
         myScrollPane.getViewport().setOpaque(false);
         myScrollPane.setViewportBorder(null);
-        setOpaque(true);
         myNavigationBar.setBorder(null);
       }
     };
@@ -286,6 +288,7 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
     myWrapperPanel = null;
     myRunPanel = null;
     myNavigationBar = null;
+    myScrollPane = null;
     myProject = null;
   }
 }