Author: markt
Date: Tue May 31 19:19:46 2016
New Revision: 1746327
URL: http://svn.apache.org/viewvc?rev=1746327&view=rev
Log:
Ensure all flushes will trigger an Exception if one has been set.
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=1746327&r1=1746326&r2=1746327&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue May 31
19:19:46 2016
@@ -1280,11 +1280,11 @@ public class Nio2Endpoint extends Abstra
@Override
protected boolean flushNonBlocking() throws IOException {
- checkError();
return flushNonBlocking(false);
}
- private boolean flushNonBlocking(boolean hasPermit) {
+ private boolean flushNonBlocking(boolean hasPermit) throws IOException
{
+ checkError();
synchronized (writeCompletionHandler) {
if (hasPermit || writePending.tryAcquire()) {
socketBufferHandler.configureWriteBufferForRead();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
