Author: fhanik
Date: Thu Oct 26 13:57:28 2006
New Revision: 468132
URL: http://svn.apache.org/viewvc?view=rev&rev=468132
Log:
Ooops, forgot to pass in the double buffered channel to the selector pool for
write and read operations
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?view=diff&rev=468132&r1=468131&r2=468132
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Thu Oct 26 13:57:28 2006
@@ -570,7 +570,7 @@
Selector selector = null;
try { selector = getSelectorPool().get(); }catch ( IOException x )
{}
try {
- nRead =
getSelectorPool().read(socket.getBufHandler().getReadBuffer(),socket.getIOChannel(),selector,rto);
+ nRead =
getSelectorPool().read(socket.getBufHandler().getReadBuffer(),socket,selector,rto);
} catch ( EOFException eof ) {
nRead = -1;
} finally {
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?view=diff&rev=468132&r1=468131&r2=468132
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Thu Oct 26 13:57:28 2006
@@ -431,7 +431,7 @@
//ignore
}
try {
- written = getSelectorPool().write(bytebuffer,
socket.getIOChannel(), selector, writeTimeout);
+ written = getSelectorPool().write(bytebuffer, socket, selector,
writeTimeout);
//make sure we are flushed
do {
if (socket.flush(selector)) break;
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=468132&r1=468131&r2=468132
==============================================================================
--- 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
Thu Oct 26 13:57:28 2006
@@ -99,7 +99,7 @@
* @throws SocketTimeoutException if the write times out
* @throws IOException if an IO Exception occurs in the underlying socket
logic
*/
- public int write(ByteBuffer buf, SocketChannel socket, Selector selector,
long writeTimeout) throws IOException {
+ public int write(ByteBuffer buf, NioChannel socket, Selector selector,
long writeTimeout) throws IOException {
SelectionKey key = null;
int written = 0;
boolean timedout = false;
@@ -118,7 +118,7 @@
}
if ( selector != null ) {
//register OP_WRITE to the selector
- if (key==null) key = socket.register(selector,
SelectionKey.OP_WRITE);
+ if (key==null) key =
socket.getIOChannel().register(selector, SelectionKey.OP_WRITE);
else key.interestOps(SelectionKey.OP_WRITE);
keycount = selector.select(writeTimeout);
}
@@ -147,7 +147,7 @@
* @throws SocketTimeoutException if the read times out
* @throws IOException if an IO Exception occurs in the underlying socket
logic
*/
- public int read(ByteBuffer buf, SocketChannel socket, Selector selector,
long readTimeout) throws IOException {
+ public int read(ByteBuffer buf, NioChannel socket, Selector selector, long
readTimeout) throws IOException {
SelectionKey key = null;
int read = 0;
boolean timedout = false;
@@ -163,7 +163,7 @@
}
if ( selector != null ) {
//register OP_WRITE to the selector
- if (key==null) key = socket.register(selector,
SelectionKey.OP_READ);
+ if (key==null) key =
socket.getIOChannel().register(selector, SelectionKey.OP_READ);
else key.interestOps(SelectionKey.OP_READ);
keycount = selector.select(readTimeout);
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?view=diff&rev=468132&r1=468131&r2=468132
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Thu Oct 26 13:57:28 2006
@@ -87,7 +87,7 @@
* @return boolean
*/
public boolean flush(Selector s, long timeout) throws IOException {
- pool.write(netOutBuffer,sc,s,timeout);
+ pool.write(netOutBuffer,this,s,timeout);
return !netOutBuffer.hasRemaining();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
