[tomcat] 01/05: Refactor isReady() in preparation for fix of BZ 64771

[markt]

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

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

commit 110a6a86b3890e58501bbc74f994b20300309c1b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 22 21:43:27 2021 +0000

    Refactor isReady() in preparation for fix of BZ 64771
    
    https://bz.apache.org/bugzilla/show_bug.cgi?id=64771
---
 java/org/apache/catalina/connector/InputBuffer.java | 6 +-----
 java/org/apache/coyote/Request.java                 | 7 +++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/InputBuffer.java 
b/java/org/apache/catalina/connector/InputBuffer.java
index 8393e09..0271c5e 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -27,8 +27,6 @@ import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.servlet.ReadListener;
 
 import org.apache.catalina.security.SecurityUtil;
@@ -309,9 +307,7 @@ public class InputBuffer extends Reader
             return true;
         }
 
-        AtomicBoolean result = new AtomicBoolean();
-        coyoteRequest.action(ActionCode.NB_READ_INTEREST, result);
-        return result.get();
+        return coyoteRequest.isReady();
     }
 
 
diff --git a/java/org/apache/coyote/Request.java 
b/java/org/apache/coyote/Request.java
index 35189e8..b15cc70 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -193,6 +193,13 @@ public final class Request {
         this.listener = listener;
     }
 
+    public boolean isReady() {
+        AtomicBoolean result = new AtomicBoolean();
+        action(ActionCode.NB_READ_INTEREST, result);
+        return result.get();
+    }
+
+
     private final AtomicBoolean allDataReadEventSent = new 
AtomicBoolean(false);
 
     public boolean sendAllDataReadEvent() {

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org