From fbd5a33336919d7b26af8d475e7b1bec64aa7c75 Mon Sep 17 00:00:00 2001
From: Kirill Kalishev <kirill.kalishev@jetbrains.com>
Date: Mon, 7 Jun 2010 13:54:24 +0400
Subject: [PATCH] NPE in tree resetting

---
 .../src/com/intellij/ide/util/treeView/AbstractTreeUi.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
index 9629b0db3afd..9a3f1341258b 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
@@ -1637,6 +1637,8 @@ public class AbstractTreeUi {
   }
 
   private ActionCallback resetToReadyNow() {
+    if (isReleased()) return new ActionCallback.Rejected();
+
     assertIsDispatchThread();
 
     DefaultMutableTreeNode[] uc = myUpdatingChildren.toArray(new DefaultMutableTreeNode[myUpdatingChildren.size()]);
@@ -2147,7 +2149,7 @@ public class AbstractTreeUi {
     try {
       progressive.run(indicator);
     } catch (ProcessCanceledException e) {
-      resetToReadyNow().doWhenDone(new Runnable() {
+      resetToReadyNow().doWhenProcessed(new Runnable() {
         public void run() {
           callback.setRejected();
         }