You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/02/22 19:49:42 UTC
svn commit: r1661518 -
/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Author: markt
Date: Sun Feb 22 18:49:42 2015
New Revision: 1661518
URL: http://svn.apache.org/r1661518
Log:
Fix infinite loop observed while running unit tests when write is called
with no data on the input side and wrapping also produces no data.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1661518&r1=1661517&r2=1661518&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Sun Feb 22 18:49:42 2015
@@ -663,8 +663,7 @@ public class SecureNio2Channel extends N
writePending = false;
throw new ExecutionException(t);
}
- integer.get(timeout, unit);
- if (written == 0) {
+ if (integer.get(timeout, unit).intValue() > 0 && written == 0) {
wrap();
return get(timeout, unit);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org