[tomcat] branch 7.0.x updated: Expand debugging for async processing

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
     new eaebe2a  Expand debugging for async processing
eaebe2a is described below

commit eaebe2a2b8145899259e563d39d2df4b85d21324
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 10 11:30:55 2019 +0100

    Expand debugging for async processing
---
 java/org/apache/coyote/ajp/AbstractAjpProcessor.java   | 18 ++++++++++++++----
 .../apache/coyote/http11/AbstractHttp11Processor.java  | 18 ++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java 
b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
index ba42828..f3c84a9 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
@@ -567,22 +567,32 @@ public abstract class AbstractAjpProcessor<S> extends 
AbstractProcessor<S> {
 
         rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
 
+        SocketState state;
+
         if (isAsync()) {
             if (getErrorState().isError()) {
                 request.updateCounters();
-                return SocketState.CLOSED;
+                state = SocketState.CLOSED;
             } else {
-                return SocketState.LONG;
+                state = SocketState.LONG;
             }
         } else {
             request.updateCounters();
             if (getErrorState().isError()) {
-                return SocketState.CLOSED;
+                state = SocketState.CLOSED;
             } else {
                 recycle(false);
-                return SocketState.OPEN;
+                state = SocketState.OPEN;
             }
         }
+
+        if (getLog().isDebugEnabled()) {
+            getLog().debug("Socket: [" + socketWrapper +
+                    "], Status in: [" + status +
+                    "], State out: [" + state + "]");
+        }
+
+        return state;
     }
 
 
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index c2750df..3fddabf 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -1803,20 +1803,30 @@ public abstract class AbstractHttp11Processor<S> 
extends AbstractProcessor<S> {
 
         rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
 
+        SocketState state;
+
         if (getErrorState().isError()) {
-            return SocketState.CLOSED;
+            state = SocketState.CLOSED;
         } else if (isAsync()) {
-            return SocketState.LONG;
+            state = SocketState.LONG;
         } else {
             if (!keepAlive) {
-                return SocketState.CLOSED;
+                state = SocketState.CLOSED;
             } else {
                 endRequest();
                 getInputBuffer().nextRequest();
                 getOutputBuffer().nextRequest();
-                return SocketState.OPEN;
+                state = SocketState.OPEN;
             }
         }
+
+        if (getLog().isDebugEnabled()) {
+            getLog().debug("Socket: [" + socketWrapper +
+                    "], Status in: [" + status +
+                    "], State out: [" + state + "]");
+        }
+
+        return state;
     }
 
 


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