From d2e367dcace00573e4481a387193bbc5cdc7f6b3 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 20 Jun 2011 14:24:19 +0000 Subject: [PATCH] Remove unnecessary code. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137638 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/Http11AprProcessor.java | 9 +-------- java/org/apache/coyote/http11/Http11AprProtocol.java | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index 8f4d20503..12b155105 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -343,15 +343,8 @@ public class Http11AprProcessor extends AbstractHttp11Processor { } - /* Copied from the AjpProcessor.java */ - public SocketState asyncDispatch(SocketWrapper socket, - SocketStatus status) { - // Setting up the socket - this.socket = socket; - long socketRef = socket.getSocket().longValue(); - inputBuffer.setSocket(socketRef); - outputBuffer.setSocket(socketRef); + public SocketState asyncDispatch(SocketStatus status) { RequestInfo rp = request.getRequestProcessor(); try { diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java index c40397833..0cbd589c6 100644 --- a/java/org/apache/coyote/http11/Http11AprProtocol.java +++ b/java/org/apache/coyote/http11/Http11AprProtocol.java @@ -230,7 +230,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { SocketState state = SocketState.CLOSED; do { if (processor.isAsync() || state == SocketState.ASYNC_END) { - state = processor.asyncDispatch(socket, status); + state = processor.asyncDispatch(status); } else if (processor.comet) { state = processor.event(status); } else { -- 2.11.0