From 4e6043b715857d542f2f2f746bfc3717888738a5 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@jetbrains.com>
Date: Fri, 28 Aug 2009 18:30:02 +0400
Subject: [PATCH] fix NPE

---
 .../intellij/openapi/wm/impl/ToolWindowImpl.java   | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java b/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java
index c3bae490a1..b8c4c7b082 100644
--- a/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java
+++ b/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java
@@ -85,11 +85,13 @@ public final class ToolWindowImpl implements ToolWindowEx {
     ApplicationManager.getApplication().assertIsDispatchThread();
     myToolWindowManager.activateToolWindow(myId, forced, autoFocusContents);
 
-    getActivation().doWhenDone(new Runnable() {
-      public void run() {
-        myToolWindowManager.invokeLater(runnable);
-      }
-    });
+    if (runnable != null) {
+      getActivation().doWhenDone(new Runnable() {
+        public void run() {
+          myToolWindowManager.invokeLater(runnable);
+        }
+      });
+    }
   }
 
   public final boolean isActive() {
@@ -100,11 +102,13 @@ public final class ToolWindowImpl implements ToolWindowEx {
   public final void show(final Runnable runnable) {
     ApplicationManager.getApplication().assertIsDispatchThread();
     myToolWindowManager.showToolWindow(myId);
-    getActivation().doWhenDone(new Runnable() {
-      public void run() {
-        myToolWindowManager.invokeLater(runnable);
-      }
-    });
+    if (runnable != null) {
+      getActivation().doWhenDone(new Runnable() {
+        public void run() {
+          myToolWindowManager.invokeLater(runnable);
+        }
+      });
+    }
   }
 
   public final void hide(final Runnable runnable) {
-- 
2.11.4.GIT