diff options
author | jonmv <venstad@gmail.com> | 2023-12-17 12:45:29 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-12-17 12:45:29 +0100 |
commit | 5eb199b2b5670458324c4e6073a5a810bee33364 (patch) | |
tree | caf488f7fe3c1d0c4062248d394547384d8ab21c /container-core | |
parent | f9c603a4bb98169c29372e93ebaf8203deb24089 (diff) |
Revert "Merge pull request #29683 from vespa-engine/revert-29678-jonmv/reapply-zk-3.9.1"
This reverts commit c8ece8b229362c7bf725e4433ef4fec86024cd29, reversing
changes made to d42b67f0fe821d122548a345f27fda7f9c9c9d10.
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java | 3 |
1 files changed, 1 insertions, 2 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 cdebd41d177..eac7b7c5df7 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,13 +216,12 @@ 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() < expectedConnLogSize && connLog.logEntries().size() < expectedConnLogSize; + reqLog.entries().size() < expectedReqLogSize && connLog.logEntries().size() < expectedConnLogSize; await(waitCondition); assertTrue(driver.close()); if (waitCondition.test(null)) await(waitCondition); |