This is an automated email from the ASF dual-hosted git repository.

markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 07d547e5f3 Code review follow-up - isReady() should return true for 
blocking IO
07d547e5f3 is described below

commit 07d547e5f30b7d7f549eeeacf2cb59ad47f66bc6
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 16 12:07:35 2026 +0100

    Code review follow-up - isReady() should return true for blocking IO
---
 java/org/apache/catalina/filters/ExpiresFilter.java | 9 ++-------
 java/org/apache/jasper/tagplugins/jstl/Util.java    | 3 +--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java 
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 7e4f01c9ba..89f73bf376 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -1085,19 +1085,14 @@ public class ExpiresFilter extends FilterBase {
             servletOutputStream.write(b);
         }
 
-        /**
-         * TODO SERVLET 3.1
-         */
         @Override
         public boolean isReady() {
-            return false;
+            return servletOutputStream.isReady();
         }
 
-        /**
-         * TODO SERVLET 3.1
-         */
         @Override
         public void setWriteListener(WriteListener listener) {
+            servletOutputStream.setWriteListener(listener);
         }
 
     }
diff --git a/java/org/apache/jasper/tagplugins/jstl/Util.java 
b/java/org/apache/jasper/tagplugins/jstl/Util.java
index 6a7077cd70..9ee4f7a2fc 100644
--- a/java/org/apache/jasper/tagplugins/jstl/Util.java
+++ b/java/org/apache/jasper/tagplugins/jstl/Util.java
@@ -309,8 +309,7 @@ public class Util {
 
             @Override
             public boolean isReady() {
-                // Non-blocking IO not supported
-                return false;
+                return true;
             }
 
             @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to