This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new b2b8c6b891 Code review follow-up - isReady() should return true for
blocking IO
b2b8c6b891 is described below
commit b2b8c6b891e5578f5be785dbfefa2b9166877f21
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 9e8038ab56..0bf7de33b3 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -1065,19 +1065,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 b846d243e4..47cdd1629a 100644
--- a/java/org/apache/jasper/tagplugins/jstl/Util.java
+++ b/java/org/apache/jasper/tagplugins/jstl/Util.java
@@ -306,8 +306,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]
