Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #8822 - Fix NPE seen on `deflater.reset()` when called after `deflater.end()` (#8881) 

* Issue #8822 - NPE on deflater.reset() called after deflater.end()

Now waiting for the server to finish writing even in case of HEAD method,
otherwise the test exit races with the server finishing to fake-write the response content.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2022-11-10 11:42:11 -06:00 committed by GitHub
parent 051588d45b
commit 34e38d2156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultServletTest.java
View File

@ -18,6 +18,7 @@ import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Instant;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
import javax.servlet.ServletException;
@ -29,7 +30,9 @@ import org.eclipse.jetty.http.DateGenerator;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.HttpTester;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.HttpChannel;
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.servlet.DefaultServlet;
@ -53,6 +56,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test the GzipHandler support when working with the {@link DefaultServlet}.
@ -78,6 +82,17 @@ public class GzipDefaultServletTest extends AbstractGzipTest
LocalConnector localConnector = new LocalConnector(server);
server.addConnector(localConnector);
CountDownLatch latch = new CountDownLatch(1);
localConnector.addBean(new HttpChannel.Listener()
{
@Override
public void onComplete(Request request)
{
latch.countDown();
}
});
Path contextDir = workDir.resolve("context");
FS.ensureDirExists(contextDir);
@ -122,6 +137,10 @@ public class GzipDefaultServletTest extends AbstractGzipTest
assertThat("Response[ETag]", response.get("ETag"), containsString(CompressedContentFormat.GZIP.getEtagSuffix()));
assertThat("Response[Content-Length]", response.get("Content-Length"), is(nullValue()));
// allow server to finish sending body (for HEAD, server.stop() races with the gzip writing thread)
assertTrue(latch.await(5, TimeUnit.SECONDS));
// A HEAD request should have similar headers, but no body
if (!method.equals("HEAD"))
{