Author: fhanik
Date: Thu Jun 7 06:48:07 2007
New Revision: 545180
URL: http://svn.apache.org/viewvc?view=rev&rev=545180
Log:
notes, still need some work on the write to socket
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/webapps/docs/aio.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?view=diff&rev=545180&r1=545179&r2=545180
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu
Jun 7 06:48:07 2007
@@ -417,6 +417,7 @@
* @param flip boolean
* @return int
* @throws IOException
+ * @todo Fix non blocking write properly
*/
private synchronized int writeToSocket(ByteBuffer bytebuffer, boolean
flip, boolean block) throws IOException {
//int limit = bytebuffer.position();
@@ -440,7 +441,7 @@
}finally {
if ( selector != null ) getSelectorPool().put(selector);
}
- socket.getBufHandler().getWriteBuffer().clear();
+ if ( block ) socket.getBufHandler().getWriteBuffer().clear(); //only
clear
this.total = 0;
return written;
}
Modified: tomcat/trunk/webapps/docs/aio.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/aio.xml?view=diff&rev=545180&r1=545179&r2=545180
==============================================================================
--- tomcat/trunk/webapps/docs/aio.xml (original)
+++ tomcat/trunk/webapps/docs/aio.xml Thu Jun 7 06:48:07 2007
@@ -409,7 +409,7 @@
<subsection name="Comet timeouts">
<p>If you are using the NIO connector, you can set individual timeouts for
your different comet connections.
To set a timeout, simple set a request attribute like the following
code shows:
- <source>CometEvent event.... event.setTimeout(30*1000);</source>
+ <source>event.setTimeout(30*1000);</source>
<br/>You can set the timeout on the comet connection at any point in
time, even asynchronously.
Setting a timeout to 1 (one milliseconds) doesn't guarantee that it
will timeout at that time.
Setting the timeout gurantees that Tomcat wont timeout the connection
before the connection has been idle
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
