From c41c1f28f91064be62df722988935f22631fec7f Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Fri, 16 Mar 2012 13:17:46 +0100
Subject: [PATCH] dispose alarm explicitly to avoid assertions

---
 .../engine/DebuggerManagerThreadImpl.java     | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebuggerManagerThreadImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebuggerManagerThreadImpl.java
index e002f96b306f..df7a6d3854ef 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/DebuggerManagerThreadImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebuggerManagerThreadImpl.java
@@ -106,25 +106,31 @@ public class DebuggerManagerThreadImpl extends InvokeAndWaitThread<DebuggerComma
     invoke(command);
 
     if (currentCommand != null) {
-      assert !myDisposed;
-      final Alarm alarm = new Alarm(Alarm.ThreadToUse.SHARED_THREAD, this);
+      final Alarm alarm = new Alarm(Alarm.ThreadToUse.SHARED_THREAD);
       alarm.addRequest(new Runnable() {
         public void run() {
-          if (currentCommand == myEvents.getCurrentEvent()) {
-            // if current command is still in progress, cancel it
-            getCurrentRequest().interrupt();
-            try {
-              getCurrentRequest().join();
-            }
-            catch (InterruptedException ignored) {
-            }
-            catch (Exception e) {
-              throw new RuntimeException(e);
-            }
-            finally {
-              startNewWorkerThread();
+          try {
+            if (currentCommand == myEvents.getCurrentEvent()) {
+              // if current command is still in progress, cancel it
+              getCurrentRequest().interrupt();
+              try {
+                getCurrentRequest().join();
+              }
+              catch (InterruptedException ignored) {
+              }
+              catch (Exception e) {
+                throw new RuntimeException(e);
+              }
+              finally {
+                if (!myDisposed) {
+                  startNewWorkerThread();
+                }
+              }
             }
           }
+          finally {
+            Disposer.dispose(alarm);
+          }
         }
       }, terminateTimeout);
     }