diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-10-15 13:25:25 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-10-15 13:25:25 +0200 |
commit | f0f17fa797862f5cf90be73864c46abf82ec2952 (patch) | |
tree | 8db914267fbcf2f7cf0479b3c579c56f9549a017 /vespaclient-container-plugin | |
parent | 1a3f3ebaecd62fa59442d6659bc4ed7565441de5 (diff) |
Be less stupid and do not consume all content yourself
Diffstat (limited to 'vespaclient-container-plugin')
2 files changed, 6 insertions, 10 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 3192c09184c..68e47bf81ad 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 @@ -614,9 +614,9 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { boolean dispatch() { if (request.isCancelled()) return true; - + if ( ! lock.tryLock()) - throw new IllegalStateException("Comcurrent attempts at dispatch — this is a bug"); + throw new IllegalStateException("Concurrent attempts at dispatch — this is a bug"); try { if (operation == null) @@ -679,9 +679,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { public void close(CompletionHandler handler) { try { delegate.close(logException); - try (UnsafeContentInputStream in = new UnsafeContentInputStream(delegate)) { - reader.accept(in); - } + reader.accept(new UnsafeContentInputStream(delegate)); handler.completed(); } catch (Exception e) { diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java index 6516b983044..ef5dc4a72dd 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java @@ -61,8 +61,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.TreeMap; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; import java.util.function.Consumer; @@ -457,9 +455,9 @@ public class DocumentV1ApiTest { // OVERLOAD is a 429 access.session.expect((id, parameters) -> new Result(Result.ResultType.TRANSIENT_ERROR, new Error("overload"))); - var response1 = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two"); - var response2 = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two"); - var response3 = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two"); + var response1 = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two", POST, "{\"fields\": {}}"); + var response2 = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two", POST, "{\"fields\": {}}"); + var response3 = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two", POST, "{\"fields\": {}}"); assertSameJson("{" + " \"pathId\": \"/document/v1/space/music/number/1/two\"," + " \"message\": \"Rejecting execution due to overload: 2 requests already enqueued\"" + |