JERSEY-2812: When Jersey deployed as servlet filter, a server-side thread processing a http request to an async resource got stuck provided the AsyncResponse was not resumed in the resource.

Change-Id: I24765f7fbf02ba692fc26486a1996b4918aaa87f

Author: stepanv

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletContainer.java

@@ -373,7 +373,8 @@ public void init() throws ServletException {
      * @param response   the {@link javax.servlet.http.HttpServletResponse} object that
      *                   contains the response the Web component returns
      *                   to the client.
-     * @return lazily initialized response status code {@link Value value provider}.
+     * @return lazily initialized response status code {@link Value value provider}. If not resolved in the moment of call to
+     * {@link Value#get()}, {@code -1} is returned.
      * @throws IOException      if an input or output error occurs
      *                          while the Web component is handling the
      *                          HTTP request.
@@ -548,11 +549,14 @@ private void doFilter(final HttpServletRequest request, final HttpServletRespons
 
         // If forwarding is configured and response is a 404 with no entity
         // body then call the next filter in the chain
-        if (webComponent.forwardOn404 && !response.isCommitted()
+
+        if (webComponent.forwardOn404
+                && !response.isCommitted()
                 // TODO when switched to servlet-api-3.0 and higher, use response.getStatus() to retrieve the status
                 // statusValue.get() forwards the call to
-                // org.glassfish.jersey.servlet.internal.ResponseWriter#getResponseContext() which may block the thread
-                // as a consequence, we must call it only if we're sure it will not block unintentionally
+                // org.glassfish.jersey.servlet.internal.ResponseWriter#getResponseContext() which may block the thread.
+                // As a consequence, we must call it only if we're sure it will not block.
+                // See Jersey2730ITCase and Jersey2812ITCase tests.
                 && statusValue.get() == Response.Status.NOT_FOUND.getStatusCode()) {
             // lets clear the response to OK before we forward to the next in the chain
             // as OK is the default set by servlet containers before filters/servlets do any wor

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebComponent.java

@@ -359,7 +359,8 @@ public WebComponent(final WebConfig webConfig, ResourceConfig resourceConfig) th
      * @param servletResponse the {@link javax.servlet.http.HttpServletResponse} object that
      *                        contains the response the Web component returns
      *                        to the client.
-     * @return lazily initialized response status code {@link Value value provider}.
+     * @return lazily initialized response status code {@link Value value provider}. If not resolved in the moment of call to
+     * {@link Value#get()}, {@code -1} is returned.
      * @throws java.io.IOException            if an input or output error occurs
      *                                        while the Web component is handling the
      *                                        HTTP request.
@@ -404,7 +405,7 @@ public void initialize(final ServiceLocator locator) {
             return Values.lazy(new Value<Integer>() {
                 @Override
                 public Integer get() {
-                    return responseWriter.getResponseStatus();
+                    return responseWriter.responseContextResolved() ? responseWriter.getResponseStatus() : -1;
                 }
             });
         } catch (final HeaderValueException hve) {

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java

@@ -268,6 +268,10 @@ public int getResponseStatus() {
         return getResponseContext().getStatus();
     }
 
+    public boolean responseContextResolved() {
+        return responseContext.isDone();
+    }
+
     private ContainerResponse getResponseContext() {
         try {
             return responseContext.get();

tests/integration/jersey-2730/pom.xml renamed to tests/integration/async-jersey-filter/pom.xml

@@ -50,12 +50,14 @@
         <version>2.18-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jersey-2730</artifactId>
+    <artifactId>async-jersey-filter</artifactId>
     <packaging>war</packaging>
-    <name>jersey-tests-integration-jersey-2730</name>
+    <name>jersey-tests-integration-jersey-async-filter</name>
 
     <description>
-        This web project reproduces ticket JERSEY-2730
+        This web project reproduces tickets:
+        JERSEY-2730
+        JERSEY-2812
     </description>
 
     <dependencies>
@@ -68,6 +70,12 @@
             <artifactId>jersey-test-framework-provider-external</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${servlet3.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

tests/integration/jersey-2730/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestApplication.java renamed to tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/async/TestApplication.java

@@ -38,13 +38,15 @@
  * holder.
  */
 
-package org.glassfish.jersey.tests.integration.jersey2730;
+package org.glassfish.jersey.tests.integration.async;
 
 import javax.ws.rs.ApplicationPath;
 
 import org.glassfish.jersey.server.ResourceConfig;
 
+import org.glassfish.jersey.tests.integration.jersey2730.TestExceptionResource;
 import org.glassfish.jersey.tests.integration.jersey2730.exception.MappedExceptionMapper;
+import org.glassfish.jersey.tests.integration.jersey2812.TestWaitResource;
 
 /**
  * Jersey application for JERSEY-2730.
@@ -57,5 +59,6 @@ public class TestApplication extends ResourceConfig {
     public TestApplication() {
         register(TestExceptionResource.class);
         register(MappedExceptionMapper.class);
+        register(TestWaitResource.class);
     }
 }

tests/integration/jersey-2730/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java renamed to tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java

@@ -47,7 +47,6 @@
 import javax.inject.Singleton;
 
 import org.glassfish.jersey.servlet.internal.ResponseWriter;
-
 import org.glassfish.jersey.tests.integration.jersey2730.exception.MappedException;
 import org.glassfish.jersey.tests.integration.jersey2730.exception.UnmappedException;
 import org.glassfish.jersey.tests.integration.jersey2730.exception.UnmappedRuntimeException;