From c0f9e8001ae50c53641eff76fd0fdf77e045f93a Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 12 Apr 2016 17:58:11 +0300
Subject: [PATCH] IDEA-154592 Deadlock in MergingUpdateQueue

---
 platform/platform-api/src/com/intellij/util/Alarm.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/util/Alarm.java b/platform/platform-api/src/com/intellij/util/Alarm.java
index 0df57002c02d..a67e23244650 100644
--- a/platform/platform-api/src/com/intellij/util/Alarm.java
+++ b/platform/platform-api/src/com/intellij/util/Alarm.java
@@ -427,10 +427,11 @@ public class Alarm implements Disposable {
 
     @Override
     public String toString() {
+      Runnable task;
       synchronized (LOCK) {
-        Runnable task = myTask;
-        return super.toString() + (task != null ? ": "+task : "");
+        task = myTask;
       }
+      return super.toString() + (task != null ? ": "+task : "");
     }
   }