Fixed Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x
# Conflicts: # jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java # jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java # jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/BufferedContentSink.java # jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ContextScopeListenerTest.java # jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpOutput.java
This commit is contained in:
parent
cd070ce6db
commit
523b594404
|
@ -109,8 +109,6 @@ public class ContextScopeListenerTest
|
|||
}
|
||||
}), "/");
|
||||
|
||||
CountDownLatch complete = new CountDownLatch(3);
|
||||
|
||||
_contextHandler.addEventListener(new ContextHandler.ContextScopeListener()
|
||||
{
|
||||
@Override
|
||||
|
@ -125,15 +123,13 @@ public class ContextScopeListenerTest
|
|||
{
|
||||
String pathInContext = (request == null) ? "null" : Request.getPathInContext(request);
|
||||
_history.add("exitScope " + pathInContext);
|
||||
complete.countDown();
|
||||
}
|
||||
});
|
||||
|
||||
URI uri = URI.create("http://localhost:" + _connector.getLocalPort() + "/initialPath");
|
||||
ContentResponse response = _client.GET(uri);
|
||||
assertThat(response.getStatus(), equalTo(HttpStatus.OK_200));
|
||||
|
||||
assertTrue(complete.await(5, TimeUnit.SECONDS));
|
||||
Awaitility.waitAtMost(5, TimeUnit.SECONDS).pollInterval(100, TimeUnit.MILLISECONDS).until(() -> _history.size() == 7);
|
||||
assertHistory(
|
||||
"enterScope /initialPath",
|
||||
"doGet",
|
||||
|
|
Loading…
Reference in New Issue