svn commit: r1637923 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11Nio2Protocol.java upgrade/Nio2Processor.java upgrade/Nio2ServletOutputStream.java

[markt]

Author: markt
Date: Mon Nov 10 16:45:55 2014
New Revision: 1637923

URL: http://svn.apache.org/r1637923
Log:
Remove Endpoint from NioServletOutputStream constructor

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
    
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1637923&r1=1637922&r2=1637923&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Mon Nov 
10 16:45:55 2014
@@ -264,7 +264,7 @@ public class Http11Nio2Protocol extends 
                 SocketWrapperBase<Nio2Channel> socket, ByteBuffer 
leftoverInput,
                 HttpUpgradeHandler httpUpgradeProcessor)
                 throws IOException {
-            return new Nio2Processor(proto.endpoint, socket, leftoverInput,
+            return new Nio2Processor(socket, leftoverInput,
                     httpUpgradeProcessor, 
proto.getUpgradeAsyncWriteBufferSize());
         }
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java?rev=1637923&r1=1637922&r2=1637923&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java Mon 
Nov 10 16:45:55 2014
@@ -22,7 +22,6 @@ import javax.servlet.http.HttpUpgradeHan
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.Nio2Channel;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
@@ -34,13 +33,11 @@ public class Nio2Processor extends Abstr
 
     private static final int INFINITE_TIMEOUT = -1;
 
-    public Nio2Processor(AbstractEndpoint<Nio2Channel> endpoint,
-            SocketWrapperBase<Nio2Channel> wrapper, ByteBuffer leftoverInput,
-            HttpUpgradeHandler httpUpgradeProcessor,
-            int asyncWriteBufferSize) {
+    public Nio2Processor(SocketWrapperBase<Nio2Channel> wrapper, ByteBuffer 
leftoverInput,
+            HttpUpgradeHandler httpUpgradeProcessor, int asyncWriteBufferSize) 
{
         super(httpUpgradeProcessor,
                 new Nio2ServletInputStream(wrapper),
-                new Nio2ServletOutputStream(wrapper, asyncWriteBufferSize, 
endpoint));
+                new Nio2ServletOutputStream(wrapper, asyncWriteBufferSize));
 
         wrapper.setTimeout(INFINITE_TIMEOUT);
         if (leftoverInput != null) {

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java?rev=1637923&r1=1637922&r2=1637923&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java 
Mon Nov 10 16:45:55 2014
@@ -27,7 +27,6 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.Nio2Channel;
 import org.apache.tomcat.util.net.Nio2Endpoint;
 import org.apache.tomcat.util.net.SocketStatus;
@@ -35,16 +34,14 @@ import org.apache.tomcat.util.net.Socket
 
 public class Nio2ServletOutputStream extends 
AbstractServletOutputStream<Nio2Channel> {
 
-    private final AbstractEndpoint<Nio2Channel> endpoint;
     private final Nio2Channel channel;
     private final int maxWrite;
     private final CompletionHandler<Integer, ByteBuffer> completionHandler;
     private final Semaphore writePending = new Semaphore(1);
 
     public Nio2ServletOutputStream(SocketWrapperBase<Nio2Channel> 
socketWrapper0,
-            int asyncWriteBufferSize, AbstractEndpoint<Nio2Channel> endpoint0) 
{
+            int asyncWriteBufferSize) {
         super(socketWrapper0, asyncWriteBufferSize);
-        this.endpoint = endpoint0;
         channel = socketWrapper0.getSocket();
         maxWrite = channel.getBufHandler().getWriteBuffer().capacity();
         this.completionHandler = new CompletionHandler<Integer, ByteBuffer>() {
@@ -58,7 +55,8 @@ public class Nio2ServletOutputStream ext
                 } else {
                     writePending.release();
                     if (!Nio2Endpoint.isInline()) {
-                        endpoint.processSocket(socketWrapper, 
SocketStatus.OPEN_WRITE, false);
+                        
socketWrapper.getEndpoint().processSocket(socketWrapper,
+                                SocketStatus.OPEN_WRITE, false);
                     }
                 }
             }
@@ -71,7 +69,7 @@ public class Nio2ServletOutputStream ext
                     return;
                 }
                 onError(exc);
-                endpoint.processSocket(socketWrapper, SocketStatus.ERROR, 
true);
+                socketWrapper.getEndpoint().processSocket(socketWrapper, 
SocketStatus.ERROR, true);
             }
         };
     }



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