summaryrefslogtreecommitdiffstats
path: root/messagebus
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-01-06 13:31:17 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2017-01-06 13:31:17 +0100
commit2befe14516136f67aec7cd6aa9f6262f29b79f6d (patch)
tree27876006fb2012fb6d16706083fe89a3323d8d7f /messagebus
parent05a7c3b134d1d5242a5499b06547749ad28e613e (diff)
Avoid race condition in waitComplete.
Diffstat (limited to 'messagebus')
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
index ad2f16f35ed..407c8d5be2a 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
@@ -228,7 +228,9 @@ public final class SourceSession implements ReplyHandler, Runnable {
Result waitComplete() throws InterruptedException {
synchronized (this) {
- this.wait();
+ while (result == null) {
+ this.wait();
+ }
}
return result;
}