Author: markt
Date: Wed Nov 12 10:48:46 2014
New Revision: 1638745
URL: http://svn.apache.org/r1638745
Log:
getLastAccess() is only called from NIO so no need to call access() from
code that is not part of NIO.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.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=1638745&r1=1638744&r2=1638745&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Wed
Nov 12 10:48:46 2014
@@ -184,8 +184,6 @@ public class InternalAprOutputBuffer ext
offset = offset + thisTime;
}
- wrapper.access();
-
if (!isBlocking() && length>0) {
// Buffer the remaining data
addToBuffers(buf, offset, length);
@@ -208,8 +206,6 @@ public class InternalAprOutputBuffer ext
protected synchronized boolean flushBuffer(boolean block)
throws IOException {
- wrapper.access();
-
if (hasMoreDataToFlush()) {
writeToSocket(block);
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java?rev=1638745&r1=1638744&r2=1638745&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
Wed Nov 12 10:48:46 2014
@@ -294,8 +294,6 @@ public class InternalNio2OutputBuffer ex
ByteBuffer writeByteBuffer =
socket.getSocket().getBufHandler().getWriteBuffer();
- socket.access();
-
if (isBlocking()) {
while (length > 0) {
int thisTime = transfer(buf, offset, length, writeByteBuffer);
@@ -416,8 +414,6 @@ public class InternalNio2OutputBuffer ex
} else {
synchronized (completionHandler) {
if (hasPermit || writePending.tryAcquire()) {
- //prevent timeout for async
- socket.access();
if (!flipped) {
byteBuffer.flip();
flipped = true;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1638745&r1=1638744&r2=1638745&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Nov 12
10:48:46 2014
@@ -2275,7 +2275,6 @@ public class AprEndpoint extends Abstrac
closeSocket(socket.getSocket().longValue());
socket = null;
} else if (state == Handler.SocketState.LONG) {
- socket.access();
if (socket.isAsync()) {
waitingRequests.add(socket);
}
@@ -2337,12 +2336,10 @@ public class AprEndpoint extends Abstrac
closeSocket(socket.getSocket().longValue());
socket.reset(null, 1);
} else if (state == Handler.SocketState.LONG) {
- socket.access();
if (socket.isAsync()) {
waitingRequests.add(socket);
}
} else if (state == Handler.SocketState.ASYNC_END) {
- socket.access();
SocketProcessor proc = new SocketProcessor(socket,
SocketStatus.OPEN_READ);
getExecutor().execute(proc);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1638745&r1=1638744&r2=1638745&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed Nov 12
10:48:46 2014
@@ -1399,7 +1399,6 @@ public class Nio2Endpoint extends Abstra
}
} else if (state == SocketState.UPGRADING) {
socket.setKeptAlive(true);
- socket.access();
launch = true;
}
} else if (handshake == -1 ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
