Upgraded to Jetty 9.3.8.v20160314

This is a bugfix release. The Release notes are here: https://github.com/eclipse/jetty.project/blob/jetty-9.3.x/VERSION.txt
dropwizard · Mar 17, 2016 · 9e5adbe · 9e5adbe
1 parent 19b4355
commit 9e5adbe
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/docs/source/about/release-notes.rst b/docs/source/about/release-notes.rst
@@ -37,7 +37,7 @@ v1.0.0
 * Upgraded to Jackson 2.6.5
 * Upgraded to JDBI 2.72 `#1358 <https://github.com/dropwizard/dropwizard/pull/1358>`_
 * Upgraded to Jersey 2.22.2
-* Upgraded to Jetty 9.3.7.v20160115 `#1330 <https://github.com/dropwizard/dropwizard/pull/1330>`_
+* Upgraded to Jetty 9.3.8.v20160314 `#1330 <https://github.com/dropwizard/dropwizard/pull/1330>`_
 * Upgraded to Joda-Time 2.9.2
 * Upgraded to Liquibase 3.4.2
 * Upgraded to liquibase-slf4j 2.0.0

diff --git a/dropwizard-bom/pom.xml b/dropwizard-bom/pom.xml
@@ -26,7 +26,7 @@
         <jersey.version>2.22.2</jersey.version>
         <jackson.api.version>2.6.0</jackson.api.version>
         <jackson.version>2.6.5</jackson.version>
-        <jetty.version>9.3.7.v20160115</jetty.version>
+        <jetty.version>9.3.8.v20160314</jetty.version>
         <servlet.version>3.0.0.v201112011016</servlet.version>
         <metrics3.version>3.1.2</metrics3.version>
         <slf4j.version>1.7.18</slf4j.version>

diff --git a/dropwizard-core/src/test/java/io/dropwizard/server/AbstractServerFactoryTest.java b/dropwizard-core/src/test/java/io/dropwizard/server/AbstractServerFactoryTest.java
@@ -4,6 +4,7 @@
 import io.dropwizard.jersey.DropwizardResourceConfig;
 import io.dropwizard.jersey.setup.JerseyContainerHolder;
 import io.dropwizard.jersey.setup.JerseyEnvironment;
+import io.dropwizard.jetty.MutableServletContextHandler;
 import io.dropwizard.setup.Environment;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.thread.ThreadPool;
@@ -36,6 +37,7 @@ public class AbstractServerFactoryTest {
     @Before
     public void before() {
         when(environment.jersey()).thenReturn(jerseyEnvironment);
+        when(environment.getApplicationContext()).thenReturn(new MutableServletContextHandler());
     }
 
     @Test

diff --git a/dropwizard-jetty/src/main/java/io/dropwizard/jetty/NonblockingServletHolder.java b/dropwizard-jetty/src/main/java/io/dropwizard/jetty/NonblockingServletHolder.java
@@ -43,12 +43,12 @@ public void handle(Request baseRequest,
                        ServletResponse response) throws ServletException, IOException {
         final boolean asyncSupported = baseRequest.isAsyncSupported();
         if (!isAsyncSupported()) {
-            baseRequest.setAsyncSupported(false);
+            baseRequest.setAsyncSupported(false, null);
         }
         try {
             servlet.service(request, response);
         } finally {
-            baseRequest.setAsyncSupported(asyncSupported);
+            baseRequest.setAsyncSupported(asyncSupported, null);
         }
     }
 }
diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/NonblockingServletHolderTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/NonblockingServletHolderTest.java
@@ -39,7 +39,7 @@ public void temporarilyDisablesAsyncRequestsIfDisabled() throws Exception {
 
         final InOrder inOrder = inOrder(baseRequest, servlet);
 
-        inOrder.verify(baseRequest).setAsyncSupported(false);
+        inOrder.verify(baseRequest).setAsyncSupported(false, null);
         inOrder.verify(servlet).service(request, response);
     }