aboutsummaryrefslogtreecommitdiffstats
path: root/vespaclient-container-plugin
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-10-15 09:30:53 +0200
committerJon Marius Venstad <venstad@gmail.com>2020-10-15 09:30:53 +0200
commit1a3f3ebaecd62fa59442d6659bc4ed7565441de5 (patch)
tree884136d3e63c9484ba51d0f09c9b26e5c6ca588a /vespaclient-container-plugin
parent463729c529464ecea03388b9f2dcf94993d03a7f (diff)
Re-add "request.isCancelled() clause
Diffstat (limited to 'vespaclient-container-plugin')
-rw-r--r--vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
index 1ef8694262d..3192c09184c 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
@@ -612,6 +612,9 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
* dispatch should be retried at a later time.
*/
boolean dispatch() {
+ if (request.isCancelled())
+ return true;
+
if ( ! lock.tryLock())
throw new IllegalStateException("Comcurrent attempts at dispatch — this is a bug");