Author: markt
Date: Tue Feb 24 12:20:49 2015
New Revision: 1661917
URL: http://svn.apache.org/r1661917
Log:
Use a return value of -1 rather than exceptions to signal end of stream.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=1661917&r1=1661916&r2=1661917&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Tue
Feb 24 12:20:49 2015
@@ -171,10 +171,9 @@ public class NioBlockingSelector {
while(!timedout) {
if (keycount > 0) { //only read if we were registered for a
read
read = socket.read(buf);
- if (read == -1)
- throw new EOFException();
- if (read > 0)
+ if (read != 0) {
break;
+ }
}
try {
if ( att.getReadLatch()==null ||
att.getReadLatch().getCount()==0) att.startReadLatch(1);
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=1661917&r1=1661916&r2=1661917&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Feb 24
12:20:49 2015
@@ -17,7 +17,6 @@
package org.apache.tomcat.util.net;
-import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -1484,8 +1483,6 @@ public class NioEndpoint extends Abstrac
}
nRead = pool.read(socketBufferHandler.getReadBuffer(),
channel, selector, att.getReadTimeout());
- } catch (EOFException eof) {
- nRead = -1;
} finally {
if (selector != null) {
pool.put(selector);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1661917&r1=1661916&r2=1661917&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Tue Feb
24 12:20:49 2015
@@ -247,10 +247,9 @@ public class NioSelectorPool {
cnt = socket.read(buf);
if (cnt == -1) {
if (read == 0) {
- throw new EOFException();
- } else {
- break;
+ read = -1;
}
+ break;
}
read += cnt;
if (cnt > 0) continue; //read some more
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
