Author: remm
Date: Wed Feb 20 11:53:42 2019
New Revision: 1853952
URL: http://svn.apache.org/viewvc?rev=1853952&view=rev
Log:
Revert possible WIP (the regular code syncs on the socket wrapper)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
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=1853952&r1=1853951&r2=1853952&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed Feb 20
11:53:42 2019
@@ -598,11 +598,6 @@ public class Nio2Endpoint extends Abstra
if (nBytes.intValue() < 0) {
failed(new EOFException(), attachment);
} else {
- /*if (Nio2Endpoint.isInline()) {
- System.out.println("Inline " + readInterest +
" " + nBytes.intValue());
- } else {
- System.out.println("Not inline " +
readInterest + " " + nBytes.intValue() + " " +
Thread.currentThread().getName());
- }*/
if (readInterest && !Nio2Endpoint.isInline()) {
readInterest = false;
notify = true;
@@ -828,16 +823,6 @@ public class Nio2Endpoint extends Abstra
@Override
public int read(boolean block, ByteBuffer to) throws IOException {
- if (!ContainerThreadMarker.isContainerThread()) {
- synchronized (this) {
- return readInternal(block, to);
- }
- } else {
- return readInternal(block, to);
- }
- }
-
- protected int readInternal(boolean block, ByteBuffer to) throws
IOException {
checkError();
if (socketBufferHandler == null) {
@@ -892,10 +877,12 @@ public class Nio2Endpoint extends Abstra
readInterest = true;
}
}
+
return nRead;
}
}
+
@Override
public void close() {
if (log.isDebugEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
