You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/03/22 21:50:59 UTC
[tomcat] branch master updated (c34b60e -> e7019f6)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from c34b60e Refactor setReadListener() in preparation for fix for BZ 64771
new 1a695b3 Fix checkstyle nag
new e7019f6 Refactor onDataAvailable() in preparation for fixing BZ 64771
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
java/org/apache/catalina/connector/InputBuffer.java | 1 +
java/org/apache/coyote/Request.java | 4 ++++
3 files changed, 6 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Fix checkstyle nag
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1a695b38dada9563e60d06cd32086d465bcaa2a5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 22 21:49:01 2021 +0000
Fix checkstyle nag
---
java/org/apache/catalina/connector/InputBuffer.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/connector/InputBuffer.java b/java/org/apache/catalina/connector/InputBuffer.java
index bcf0571..de306f5 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -27,6 +27,7 @@ import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+
import jakarta.servlet.ReadListener;
import org.apache.catalina.security.SecurityUtil;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Refactor onDataAvailable() in preparation for
fixing BZ 64771
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e7019f6bbfdce78b88b82f1ed01add25290b3538
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 22 21:51:24 2021 +0000
Refactor onDataAvailable() in preparation for fixing BZ 64771
https://bz.apache.org/bugzilla/show_bug.cgi?id=64771
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
java/org/apache/coyote/Request.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java
index b39f07b..ea3dbe4 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -207,7 +207,7 @@ public class CoyoteAdapter implements Adapter {
// onAllDataRead() event. Therefore, make sure
// onDataAvailable() is not called in this case.
if (!request.isFinished()) {
- readListener.onDataAvailable();
+ req.onDataAvailable();
}
if (request.isFinished() && req.sendAllDataReadEvent()) {
readListener.onAllDataRead();
diff --git a/java/org/apache/coyote/Request.java b/java/org/apache/coyote/Request.java
index 4bee2b4..0fd62c3 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -216,6 +216,10 @@ public final class Request {
return result.get();
}
+ public void onDataAvailable() throws IOException {
+ listener.onDataAvailable();
+ }
+
private final AtomicBoolean allDataReadEventSent = new AtomicBoolean(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org