From 1d5d8071ba92a7144a3ff0fc9d6df12f2eb7200b Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Wed, 19 May 2021 15:53:49 +0200 Subject: [PATCH] review comments Signed-off-by: Ludovic Orban --- .../src/main/java/org/eclipse/jetty/server/HttpInput.java | 5 +++-- .../org/eclipse/jetty/http/client/RequestReaderTest.java | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java index cad3452fe4c0..e41362b3a1cc 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java @@ -55,7 +55,8 @@ public HttpInput(HttpChannelState state) public void recycle() { - reopen(); + if (LOG.isDebugEnabled()) + LOG.debug("recycle {}", this); } public void reopen() @@ -63,7 +64,7 @@ public void reopen() try (AutoLock lock = _contentProducer.lock()) { if (LOG.isDebugEnabled()) - LOG.debug("recycle/reopen {}", this); + LOG.debug("reopen {}", this); _blockingContentProducer.recycle(); _contentProducer = _blockingContentProducer; _consumedEof = false; diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/RequestReaderTest.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/RequestReaderTest.java index fc08dd510a3b..0cb195bdfcbf 100644 --- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/RequestReaderTest.java +++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/RequestReaderTest.java @@ -56,12 +56,13 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques if (b == -1) break; } + // Paranoid check. + assertThat(br.read(), is(-1)); baseRequest.setHandled(true); } }, client -> {}); - ContentResponse response1 = scenario.client.newRequest("localhost", scenario.server.getURI().getPort()) - .scheme(scenario.server.getURI().getScheme()) + ContentResponse response1 = scenario.client.newRequest(scenario.newURI()) .method("POST") .timeout(5, TimeUnit.SECONDS) .body(new BytesRequestContent(new byte[512])) @@ -69,8 +70,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques assertThat(response1.getStatus(), is(HttpStatus.OK_200)); // Send a 2nd request to make sure recycling works. - ContentResponse response2 = scenario.client.newRequest("localhost", scenario.server.getURI().getPort()) - .scheme(scenario.server.getURI().getScheme()) + ContentResponse response2 = scenario.client.newRequest(scenario.newURI()) .method("POST") .timeout(5, TimeUnit.SECONDS) .body(new BytesRequestContent(new byte[512]))