svn commit: r1480220 - /tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java

[markt]

Author: markt
Date: Wed May  8 10:29:33 2013
New Revision: 1480220

URL: http://svn.apache.org/r1480220
Log:
Fix the last access time TODOs (we'll need the wrapper for the non-blocking 
changes anyway).

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.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=1480220&r1=1480219&r2=1480220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Wed 
May  8 10:29:33 2013
@@ -76,6 +76,9 @@ public class InternalAprOutputBuffer ext
     private long socket;
 
 
+    private SocketWrapper<Long> wrapper;
+
+
     /**
      * Direct byte buffer used for writing.
      */
@@ -88,6 +91,7 @@ public class InternalAprOutputBuffer ext
     public void init(SocketWrapper<Long> socketWrapper,
             AbstractEndpoint endpoint) throws IOException {
 
+        wrapper = socketWrapper;
         socket = socketWrapper.getSocket().longValue();
         Socket.setsbb(this.socket, bbuf);
     }
@@ -103,6 +107,7 @@ public class InternalAprOutputBuffer ext
         super.recycle();
 
         bbuf.clear();
+        wrapper = null;
     }
 
 
@@ -169,7 +174,7 @@ public class InternalAprOutputBuffer ext
             offset = offset + thisTime;
         }
 
-        // TODO: Review how to update the SocketWrapper's last accessed time
+        wrapper.access();
 
         if (!isBlocking() && length>0) {
             // Buffer the remaining data
@@ -196,7 +201,7 @@ public class InternalAprOutputBuffer ext
     @Override
     protected boolean flushBuffer(boolean block) throws IOException {
 
-        // TODO: Review how to update the SocketWrapper's last accessed time
+        wrapper.access();
 
         boolean dataLeft = hasMoreDataToFlush();
 



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