367716 simplified maxIdleTime logic

2 files changed, 2 insertions, 4 deletions

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
index f9846745e6..9ed4119c93 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
@@ -185,9 +185,6 @@ public class AsyncContinuation implements AsyncContext, Continuation
     }
     
     /* ------------------------------------------------------------ */
-    /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#isSuspended()
-     */
     public boolean isSuspending()
     {
         synchronized(this)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
index 0f68b4ed6b..59e66626e6 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
@@ -146,7 +146,8 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
                 _generator.returnBuffers();
             }
             
-            if (_request.getAsyncContinuation().isComplete() || _request.getAsyncContinuation().isInitial())
+            // reenable idle checking unless request is suspended
+            if(!_request.getAsyncContinuation().isAsyncStarted())
             {
                 _asyncEndp.setCheckForIdle(true);
             }