From 75654a3490c8383b01fd27479c19f99b5f7e9b95 Mon Sep 17 00:00:00 2001
From: Serega Vasiliev <sergey.vasiliev@jetbrains.com>
Date: Tue, 7 Feb 2012 13:44:01 +0100
Subject: [PATCH] fixed NPE

---
 .../com/intellij/execution/ui/RunContentManagerImpl.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
index 0a6f6b508feb..7cbabe09b65e 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
@@ -48,6 +48,7 @@ import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.ui.content.*;
+import com.intellij.ui.content.impl.ContentImpl;
 import com.intellij.ui.docking.DockManager;
 import com.intellij.util.concurrency.Semaphore;
 import com.intellij.util.containers.ContainerUtil;
@@ -279,13 +280,11 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
       getSyncPublisher().contentRemoved(oldDescriptor, executor);
       oldDescriptor.dispose(); // is of the same category, can be reused
     }
-    else if (descriptor.getAttachedContent() == null) {
+    else {
       content = createNewContent(contentManager, descriptor, executor);
       final Icon icon = descriptor.getIcon();
       content.setIcon(icon == null ? executor.getToolWindowIcon() : icon);
-    } else {
-      content = descriptor.getAttachedContent();
-    }
+  }
 
     content.setComponent(descriptor.getComponent());
     content.putUserData(DESCRIPTOR_KEY, descriptor);