if someone removes a callback, we must clear pending and signal/prevent anyone from sleeping there.

1 files changed, 4 insertions, 1 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 00f5606b93a..949be19c3eb 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
@@ -48,7 +48,10 @@ public class SharedSender implements ReplyHandler {
     }
 
     public void remove(ResultCallback owner) {
-        activeOwners.remove(owner);
+        OwnerState state = activeOwners.remove(owner);
+        if (state != null) {
+            state.clearPending();
+        }
     }
 
     public void shutdown() {