From 8149382bc37bdd62646c6d5274b8b1a80bdfb105 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 17 Jun 2011 22:16:26 +0000 Subject: [PATCH] Connector re-factoring Remove the need to track isAsync in the SocketWrapper git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137052 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/ajp/AjpProtocol.java | 4 +--- java/org/apache/coyote/http11/Http11Protocol.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java index ab1e14984..dea78cf5d 100644 --- a/java/org/apache/coyote/ajp/AjpProtocol.java +++ b/java/org/apache/coyote/ajp/AjpProtocol.java @@ -137,7 +137,7 @@ public class AjpProtocol extends AbstractAjpProtocol { SocketState state = SocketState.CLOSED; do { - if (socket.isAsync() || state == SocketState.ASYNC_END) { + if (processor.isAsync() || state == SocketState.ASYNC_END) { state = processor.asyncDispatch(status); } else { state = processor.process(socket); @@ -152,9 +152,7 @@ public class AjpProtocol extends AbstractAjpProtocol { if (state == SocketState.LONG) { connections.put(socket, processor); - socket.setAsync(true); } else { - socket.setAsync(false); processor.recycle(); recycledProcessors.offer(processor); } diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java index 0ad528394..64d62e51b 100644 --- a/java/org/apache/coyote/http11/Http11Protocol.java +++ b/java/org/apache/coyote/http11/Http11Protocol.java @@ -156,7 +156,7 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol { SocketState state = SocketState.CLOSED; do { - if (socket.isAsync() || state == SocketState.ASYNC_END) { + if (processor.isAsync() || state == SocketState.ASYNC_END) { state = processor.asyncDispatch(status); } else { state = processor.process(socket); @@ -171,9 +171,7 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol { if (state == SocketState.LONG) { connections.put(socket, processor); - socket.setAsync(true); } else { - socket.setAsync(false); processor.recycle(); recycledProcessors.offer(processor); } -- 2.11.0