Fix race condition in the case of concurrent initial send.

1 files changed, 5 insertions, 2 deletions

diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
index 5601210512e..cb2fe2dee83 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
@@ -143,8 +143,11 @@ public class SharedSender implements ReplyHandler {
 
         OwnerState state = activeOwners.get(owner);
         if (state == null) {
-            state = new OwnerState();
-            activeOwners.put(owner, state);
+            OwnerState newState = new OwnerState();
+            state = activeOwners.putIfAbsent(owner, newState);
+            if (state == null) {
+                state = newState;
+            }
         }
         if (maxPendingPerOwner != -1 && blockingQueue) {
             state.waitMaxPendingbelow(maxPendingPerOwner);