From f946469061688154fc86d4cc8a68e7fc15fd3871 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 30 Apr 2012 13:15:08 +0200
Subject: [PATCH] EA-35827 - NPE: ConsoleViewImpl.clear concurrent disposing

---
 .../src/com/intellij/execution/impl/ConsoleViewImpl.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
index 0d4c79a30a51..56023d8c7d0e 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
@@ -326,8 +326,12 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
       // real document content will be cleared on next flush;
       myContentSize = 0;
       myBuffer.clear();
-      myHyperlinks.clearHyperlinks();
       myFolding.clear();
+
+      final EditorHyperlinkSupport hyperlinks = myHyperlinks;
+      if (hyperlinks != null) {
+        hyperlinks.clearHyperlinks();
+      }
     }
     if (myFlushAlarm.isDisposed()) return;
     cancelAllFlushRequests();