diff options
author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-09-25 17:12:05 +0000 |
---|---|---|
committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-09-25 17:12:05 +0000 |
commit | 4fbbe614fe6a4bb0301615e28501b3b211abe109 (patch) | |
tree | 844d1a2cc1a5f847e97228988939eb79e936326a /src/net/java/sip/communicator/util/swing | |
parent | a52479a6129d04115d2d51beb11a4ff8def0d62e (diff) | |
download | jitsi-4fbbe614fe6a4bb0301615e28501b3b211abe109.zip jitsi-4fbbe614fe6a4bb0301615e28501b3b211abe109.tar.gz jitsi-4fbbe614fe6a4bb0301615e28501b3b211abe109.tar.bz2 |
Fixes SwingWorker#get(). Reported by Yana Stamcheva.
Diffstat (limited to 'src/net/java/sip/communicator/util/swing')
-rw-r--r-- | src/net/java/sip/communicator/util/swing/SwingWorker.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/util/swing/SwingWorker.java b/src/net/java/sip/communicator/util/swing/SwingWorker.java index 0e11133..d895657 100644 --- a/src/net/java/sip/communicator/util/swing/SwingWorker.java +++ b/src/net/java/sip/communicator/util/swing/SwingWorker.java @@ -152,12 +152,12 @@ public abstract class SwingWorker { boolean interrupted = false; - while (!future.isDone()) + do { - value = null; try { value = future.get(); + break; } catch (CancellationException ce) { @@ -172,6 +172,7 @@ public abstract class SwingWorker interrupted = true; } } + while (true); if (interrupted) // propagate Thread.currentThread().interrupt(); } |