Author: markt
Date: Sun Feb 22 18:49:37 2015
New Revision: 1661517
URL: http://svn.apache.org/r1661517
Log:
Update I/O implementations to support returning -1 for end of stream.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
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=1661517&r1=1661516&r2=1661517&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sun Feb 22
18:49:37 2015
@@ -2495,7 +2495,7 @@ public class AprEndpoint extends Abstrac
return 0;
}
} else if (-result == Status.APR_EOF) {
- throw new EOFException(sm.getString("socket.apr.clientAbort"));
+ return -1;
} else if ((OS.IS_WIN32 || OS.IS_WIN64) &&
(-result == Status.APR_OS_START_SYSERR + 10053)) {
// 10053 on Windows is connection aborted
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=1661517&r1=1661516&r2=1661517&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Sun Feb 22
18:49:37 2015
@@ -1064,7 +1064,7 @@ public class Nio2Endpoint extends Abstra
} else if (nRead == 0 && !block) {
readInterest = true;
} else if (nRead == -1) {
- throw new EOFException();
+ return -1;
}
if (log.isDebugEnabled()) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1661517&r1=1661516&r2=1661517&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Feb 22
18:49:37 2015
@@ -1438,8 +1438,7 @@ public class NioEndpoint extends Abstrac
leftToWrite -= nRead;
}
} else if (nRead == -1) {
- // TODO i18n
- throw new EOFException();
+ return -1;
}
return len - leftToWrite;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
