Author: fhanik Date: Sun Jan 28 13:35:53 2007 New Revision: 500892 URL: http://svn.apache.org/viewvc?view=rev&rev=500892 Log: Fix for bugzilla 41466 When using the NioChannel and SecureNioChannel its important to use the channels buffers
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?view=diff&rev=500892&r1=500891&r2=500892 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Sun Jan 28 13:35:53 2007 @@ -103,6 +103,10 @@ boolean timedout = false; int keycount = 1; //assume we can write long time = System.currentTimeMillis(); //start the timeout timer + if ( socket.getBufHandler().getWriteBuffer()!= buf ) { + socket.getBufHandler().getWriteBuffer().put(buf); + buf = socket.getBufHandler().getWriteBuffer(); + } try { while ( (!timedout) && buf.hasRemaining() ) { if ( keycount > 0 ) { //only write if we were registered for a write --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]