Author: remm
Date: Tue Feb 19 20:29:10 2019
New Revision: 1853917
URL: http://svn.apache.org/viewvc?rev=1853917&view=rev
Log:
Trigger a build.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1853917&r1=1853916&r2=1853917&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue
Feb 19 20:29:10 2019
@@ -786,7 +786,6 @@ public class Nio2Endpoint extends Abstra
synchronized (readCompletionHandler) {
// Fill the read buffer as best we can.
nRead = fillReadBuffer(block);
-
// Fill as much of the remaining byte array as possible with
the
// data that was just read
if (nRead > 0) {
@@ -796,7 +795,6 @@ public class Nio2Endpoint extends Abstra
} else if (nRead == 0 && !block &&
ContainerThreadMarker.isContainerThread()) {
readInterest = true;
}
-
if (log.isDebugEnabled()) {
log.debug("Socket: [" + this + "], Read: [" + nRead + "]");
}
@@ -853,7 +851,6 @@ public class Nio2Endpoint extends Abstra
if (log.isDebugEnabled()) {
log.debug("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
}
-
// Fill as much of the remaining byte array as possible
with the
// data that was just read
if (nRead > 0) {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1853917&r1=1853916&r2=1853917&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Tue Feb 19 20:29:10 2019
@@ -48,10 +48,12 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.Context;
+import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.BytesStreamer;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
@@ -93,6 +95,11 @@ public class TestNonBlockingAPI extends
@Test
public void testNonBlockingReadAsync() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+ Connector connector = tomcat.getConnector();
+ // Skip for NIO2
+ Assume.assumeFalse("This test fails for NIO2",
+
/*connector.getProtocolHandlerClassName().contains("Nio2")*/false);
doTestNonBlockingRead(false, true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
