diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletRequestState.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletRequestState.java index ac636441931e..937adbc0e6d7 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletRequestState.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletRequestState.java @@ -735,9 +735,7 @@ public boolean onIdleTimeout(TimeoutException timeout) { if (LOG.isDebugEnabled()) LOG.debug("onIdleTimeout {}", getStatusStringLocked(), timeout); - // TODO this is almost always returning false?!? what about read/write timeouts??? - // return _state == State.IDLE; - return true; + return _state == State.IDLE; } } diff --git a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java index fa7cc5ac121e..0d9795b48f4a 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java +++ b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java @@ -88,7 +88,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se { try { - Thread.sleep(2000); + Thread.sleep(1000); } catch (InterruptedException e) {