From bab044f90cc04c5c696a6c992157199b81d416c3 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 26 Aug 2013 13:31:26 +0200
Subject: [PATCH] restore Alarm.cancelRequest

---
 .../src/com/intellij/util/Alarm.java          | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/util/Alarm.java b/platform/platform-api/src/com/intellij/util/Alarm.java
index 56bab6e93f60..05c5a1a30ec6 100644
--- a/platform/platform-api/src/com/intellij/util/Alarm.java
+++ b/platform/platform-api/src/com/intellij/util/Alarm.java
@@ -255,17 +255,7 @@ public class Alarm implements Disposable {
 
     private Request(@NotNull final Runnable task, @Nullable ModalityState modalityState, long delayMillis) {
       synchronized (LOCK) {
-        myTask = new Runnable() {
-          @Override
-          public void run() {
-            try {
-              task.run();
-            }
-            catch (Exception e) {
-              LOG.error("Exception in task " + task, e);
-            }
-          }
-        };
+        myTask = task;
         myModalityState = modalityState;
         myDelay = delayMillis;
       }
@@ -296,10 +286,15 @@ public class Alarm implements Disposable {
 
             if (myThreadToUse == ThreadToUse.SWING_THREAD && !isEdt()) {
               //noinspection SSBasedInspection
-              SwingUtilities.invokeLater(task);
+              SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                  QueueProcessor.runSafely(task);
+                }
+              });
             }
             else {
-              task.run();
+              QueueProcessor.runSafely(task);
             }
           }
         };