svn commit: r1650273 - in /tomcat/trunk/java/org/apache/coyote/http11: InternalAprOutputBuffer.java InternalNioOutputBuffer.java

[markt]

Author: markt
Date: Thu Jan  8 13:10:15 2015
New Revision: 1650273

URL: http://svn.apache.org/r1650273
Log:
Aligning NIO and APR

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
    tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1650273&r1=1650272&r2=1650273&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Thu 
Jan  8 13:10:15 2015
@@ -21,8 +21,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import org.apache.coyote.Response;
-import org.apache.tomcat.jni.Socket;
-import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.AprEndpoint;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
@@ -50,27 +48,11 @@ public class InternalAprOutputBuffer ext
     }
 
 
-    // ----------------------------------------------------- Instance Variables
-
-
-    /**
-     * Underlying socket.
-     */
-    private long socket;
-
-
-    private AbstractEndpoint<Long> endpoint;
-
-
     // --------------------------------------------------------- Public Methods
 
     @Override
     public void init(SocketWrapperBase<Long> socketWrapper) {
         super.init(socketWrapper);
-        socket = socketWrapper.getSocket().longValue();
-        this.endpoint = socketWrapper.getEndpoint();
-
-        Socket.setsbb(this.socket, socketWriteBuffer);
         socketWrapper.socketWriteBuffer = socketWriteBuffer;
     }
 
@@ -83,7 +65,6 @@ public class InternalAprOutputBuffer ext
     public void recycle() {
         super.recycle();
         socketWriteBuffer.clear();
-        socket = 0;
     }
 
 
@@ -103,6 +84,7 @@ public class InternalAprOutputBuffer ext
 
     @Override
     protected void registerWriteInterest() {
-        ((AprEndpoint) endpoint).getPoller().add(socket, -1, false, true);
+        ((AprEndpoint) socketWrapper.getEndpoint()).getPoller().add(
+                socketWrapper.getSocket().longValue(), -1, false, true);
     }
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1650273&r1=1650272&r2=1650273&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu 
Jan  8 13:10:15 2015
@@ -59,7 +59,6 @@ public class InternalNioOutputBuffer ext
     public void recycle() {
         super.recycle();
         socketWriteBuffer.clear();
-        socketWrapper = null;
     }
 
 



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