Author: fhanik
Date: Thu May 31 12:44:27 2007
New Revision: 543228
URL: http://svn.apache.org/viewvc?view=rev&rev=543228
Log:
consolidate the usage of the NioChannel buffers
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?view=diff&rev=543228&r1=543227&r2=543228
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Thu
May 31 12:44:27 2007
@@ -48,10 +48,6 @@
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
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?view=diff&rev=543228&r1=543227&r2=543228
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Thu May
31 12:44:27 2007
@@ -29,7 +29,6 @@
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.MutableInteger;
-import java.util.Iterator;
/**
*
@@ -138,6 +137,10 @@
public int write(ByteBuffer buf, NioChannel socket, Selector selector,
long writeTimeout, boolean block,MutableInteger
lastWrite) throws IOException {
+ if (socket.getBufHandler().getWriteBuffer() != buf) {
+ socket.getBufHandler().getWriteBuffer().put(buf);
+ buf = socket.getBufHandler().getWriteBuffer();
+ }
if ( SHARED && block ) {
return
NioBlockingSelector.write(buf,socket,writeTimeout,lastWrite);
}
@@ -146,10 +149,6 @@
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() ) {
int cnt = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
