summaryrefslogtreecommitdiffstats
path: root/configserver/src/test
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-11-21 13:54:45 +0100
committerHarald Musum <musum@oath.com>2017-11-21 13:54:45 +0100
commitf121e459f54414903ab2a914e8e981adcec593eb (patch)
tree2f064637934b882d8a4a5ec900ef303a39819388 /configserver/src/test
parent78c5a127ae16a1478ab86c690aa8123f49e3412b (diff)
Do not remove from queue when cancelling
We have already drained the queue before cancelling a delayed response, so it is a bug to try to remove anything from it
Diffstat (limited to 'configserver/src/test')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java
index 122deadb841..0126a9e2f29 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java
@@ -12,8 +12,6 @@ import com.yahoo.vespa.config.protocol.JRTServerConfigRequest;
import com.yahoo.vespa.config.protocol.JRTServerConfigRequestV3;
import com.yahoo.vespa.config.protocol.Trace;
import com.yahoo.vespa.config.server.GetConfigContext;
-import com.yahoo.vespa.config.server.rpc.DelayedConfigResponses;
-import com.yahoo.vespa.config.server.rpc.MockRpc;
import org.junit.Test;
import java.util.Collections;
@@ -58,7 +56,7 @@ public class DelayedConfigResponseTest {
DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false);
responses.delayResponse(createRequest("foolio", "md5", "myid", "mymd5", 3, 100000, "bar"), context);
assertThat(responses.size(), is(1));
- responses.allDelayedResponses().get(0).cancel();
+ responses.allDelayedResponses().get(0).cancelAndRemove();
assertThat(responses.size(), is(0));
}