summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorHarald Musum <musum@vespa.ai>2023-12-16 10:04:42 +0100
committerGitHub <noreply@github.com>2023-12-16 10:04:42 +0100
commit65de0a24ea030de6bc0af330c73f3a772fa41e36 (patch)
treeb09186497c636ddd6cb438db0f66fc5fe64393d7 /container-core
parentd42b67f0fe821d122548a345f27fda7f9c9c9d10 (diff)
Revert "Jonmv/reapply zk 3.9.1"
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java
index eac7b7c5df7..cdebd41d177 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java
@@ -216,12 +216,13 @@ class ProxyProtocolTest {
}
}
+
/* Don't close Jetty to early ensuring that the request log is written */
private static void assertLogSizeAndCloseDriver(
JettyTestDriver driver, InMemoryRequestLog reqLog, int expectedReqLogSize, InMemoryConnectionLog connLog,
int expectedConnLogSize) {
Predicate<Void> waitCondition = __ ->
- reqLog.entries().size() < expectedReqLogSize && connLog.logEntries().size() < expectedConnLogSize;
+ reqLog.entries().size() < expectedConnLogSize && connLog.logEntries().size() < expectedConnLogSize;
await(waitCondition);
assertTrue(driver.close());
if (waitCondition.test(null)) await(waitCondition);