svn commit: r1637928 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProtocol.java upgrade/AprProcessor.java upgrade/AprServletOutputStream.java

[markt]

Author: markt
Date: Mon Nov 10 16:46:32 2014
New Revision: 1637928

URL: http://svn.apache.org/r1637928
Log:
Remove endpoint from AprServletOutputStream

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java
    
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1637928&r1=1637927&r2=1637928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Nov 
10 16:46:32 2014
@@ -325,8 +325,7 @@ public class Http11AprProtocol extends A
                 SocketWrapperBase<Long> socket, ByteBuffer leftoverInput,
                 HttpUpgradeHandler httpUpgradeProcessor)
                 throws IOException {
-            return new AprProcessor(socket, leftoverInput,
-                    httpUpgradeProcessor, (AprEndpoint) proto.endpoint,
+            return new AprProcessor(socket, leftoverInput, 
httpUpgradeProcessor,
                     proto.getUpgradeAsyncWriteBufferSize());
         }
     }

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java?rev=1637928&r1=1637927&r2=1637928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java Mon 
Nov 10 16:46:32 2014
@@ -23,7 +23,6 @@ import javax.servlet.http.HttpUpgradeHan
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.jni.Socket;
-import org.apache.tomcat.util.net.AprEndpoint;
 import org.apache.tomcat.util.net.AprEndpoint.AprSocketWrapper;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
@@ -36,11 +35,10 @@ public class AprProcessor extends Abstra
     private static final int INFINITE_TIMEOUT = -1;
 
     public AprProcessor(SocketWrapperBase<Long> wrapper, ByteBuffer 
leftOverInput,
-            HttpUpgradeHandler httpUpgradeProcessor, AprEndpoint endpoint,
-            int asyncWriteBufferSize) {
+            HttpUpgradeHandler httpUpgradeProcessor, int asyncWriteBufferSize) 
{
         super(httpUpgradeProcessor,
                 new AprServletInputStream(wrapper),
-                new AprServletOutputStream(wrapper, asyncWriteBufferSize, 
endpoint));
+                new AprServletOutputStream(wrapper, asyncWriteBufferSize));
         ((AprSocketWrapper) wrapper).setLeftOverInput(leftOverInput);
         Socket.timeoutSet(wrapper.getSocket().longValue(), INFINITE_TIMEOUT);
     }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java?rev=1637928&r1=1637927&r2=1637928&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java 
Mon Nov 10 16:46:32 2014
@@ -32,17 +32,15 @@ public class AprServletOutputStream exte
 
     private static final int SSL_OUTPUT_BUFFER_SIZE = 8192;
 
-    private final AprEndpoint endpoint;
     private final long socket;
     private volatile boolean closed = false;
     private final ByteBuffer sslOutputBuffer;
 
     public AprServletOutputStream(SocketWrapperBase<Long> socketWrapper,
-            int asyncWriteBufferSize, AprEndpoint endpoint) {
+            int asyncWriteBufferSize) {
         super(socketWrapper, asyncWriteBufferSize);
-        this.endpoint = endpoint;
         this.socket = socketWrapper.getSocket().longValue();
-        if (endpoint.isSSLEnabled()) {
+        if (socketWrapper.getEndpoint().isSSLEnabled()) {
             sslOutputBuffer = 
ByteBuffer.allocateDirect(SSL_OUTPUT_BUFFER_SIZE);
             sslOutputBuffer.position(SSL_OUTPUT_BUFFER_SIZE);
         } else {
@@ -76,7 +74,7 @@ public class AprServletOutputStream exte
             // Set the current settings for this socket
             socketWrapper.setBlockingStatus(block);
             if (block) {
-                Socket.timeoutSet(socket, endpoint.getSoTimeout() * 1000);
+                Socket.timeoutSet(socket, 
socketWrapper.getEndpoint().getSoTimeout() * 1000);
             } else {
                 Socket.timeoutSet(socket, 0);
             }
@@ -106,7 +104,7 @@ public class AprServletOutputStream exte
         int written;
 
         do {
-            if (endpoint.isSSLEnabled()) {
+            if (socketWrapper.getEndpoint().isSSLEnabled()) {
                 if (sslOutputBuffer.remaining() == 0) {
                     // Buffer was fully written last time around
                     sslOutputBuffer.clear();
@@ -147,7 +145,7 @@ public class AprServletOutputStream exte
         } while (written > 0 && left > 0);
 
         if (left > 0) {
-            endpoint.getPoller().add(socket, -1, false, true);
+            ((AprEndpoint) 
socketWrapper.getEndpoint()).getPoller().add(socket, -1, false, true);
         }
         return len - left;
     }



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