From 4d8960aa7fa187c4ed37fa5a310cbc7672559e59 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Thu, 15 Mar 2012 12:13:55 +0100 Subject: [PATCH] AppCode:Debugger: Cannot restart simulator when app was previously on a breakpoint (OC-1322) AppCode:Simulator: starting simulator rewritten to avoid deadlocks and UI blocking --- .../util/src/com/intellij/util/concurrency/FutureResult.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/util/src/com/intellij/util/concurrency/FutureResult.java b/platform/util/src/com/intellij/util/concurrency/FutureResult.java index d5ad8640b416..141b21816886 100644 --- a/platform/util/src/com/intellij/util/concurrency/FutureResult.java +++ b/platform/util/src/com/intellij/util/concurrency/FutureResult.java @@ -2,6 +2,7 @@ package com.intellij.util.concurrency; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; +import org.jetbrains.annotations.Nullable; import java.util.concurrent.*; import java.util.concurrent.Semaphore; @@ -27,7 +28,7 @@ public class FutureResult implements Future { return myValue != null; } - public void set(T result) { + public void set(@Nullable T result) { assert myValue == null; myValue = Ref.create(Pair.create((Object)result, true));