Merge "JERSEY-2494 AsyncResponse timeouts creates unnecessary GC pressure"

Author: Marek Potočiar

containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpHandlerContainer.java

@@ -291,12 +291,12 @@ private long getResponseLength(long contentLength) {
 
         @Override
         public boolean suspend(long timeOut, TimeUnit timeUnit, TimeoutHandler timeoutHandler) {
-            throw new UnsupportedOperationException("Method suspend is not support by the container.");
+            throw new UnsupportedOperationException("Method suspend is not supported by the container.");
         }
 
         @Override
         public void setSuspendTimeout(long timeOut, TimeUnit timeUnit) throws IllegalStateException {
-            throw new UnsupportedOperationException("Method suspend is not support by the container.");
+            throw new UnsupportedOperationException("Method setSuspendTimeout is not supported by the container.");
         }
 
         @Override

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

@@ -206,6 +206,7 @@ public void commit() {
                 }
             }
         } finally {
+            requestTimeoutHandler.close();
             asyncExt.complete();
         }
     }
@@ -233,6 +234,7 @@ public void failure(Throwable error) {
                 }
             }
         } finally {
+            requestTimeoutHandler.close();
             rethrow(error);
         }
     }

core-server/src/main/java/org/glassfish/jersey/server/ApplicationHandler.java

@@ -984,13 +984,14 @@ public void commit() {
                     // need to also strip the object entity as it was stripped when writing to output
                     current.setEntity(null);
                 }
-
+                requestTimeoutHandler.close();
                 super.set(current);
             }
         }
 
         @Override
         public void failure(final Throwable error) {
+            requestTimeoutHandler.close();
             super.setException(error);
         }
 

core-server/src/main/java/org/glassfish/jersey/server/internal/JerseyRequestTimeoutHandler.java

@@ -135,10 +135,7 @@ public void run() {
                 throw new IllegalStateException(LocalizationMessages.SUSPEND_NOT_SUSPENDED());
             }
 
-            if (timeoutTask != null) {
-                timeoutTask.cancel(true);
-                timeoutTask = null;
-            }
+            close();
 
             if (timeOut <= AsyncResponse.NO_TIMEOUT) {
                 return;
@@ -151,4 +148,14 @@ public void run() {
             }
         }
     }
+
+    /**
+     * Cancel the suspended task.
+     */
+    public synchronized void close() {
+        if (timeoutTask != null) {
+            timeoutTask.cancel(true);
+            timeoutTask = null;
+        }
+    }
 }