Author: markt
Date: Sat Oct 1 14:49:59 2011
New Revision: 1178005
URL: http://svn.apache.org/viewvc?rev=1178005&view=rev
Log:
Remove unused parameters
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=1178005&r1=1178004&r2=1178005&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Sat Oct 1 14:49:59 2011
@@ -98,7 +98,7 @@ public class NioSender extends AbstractS
return false;
}//end if
} else if ( key.isWritable() ) {
- boolean writecomplete = write(key);
+ boolean writecomplete = write();
if ( writecomplete ) {
//we are completed, should we read an ack?
if ( waitForAck ) {
@@ -108,7 +108,7 @@ public class NioSender extends AbstractS
//if not, we are ready, setMessage will reregister us for
another write interest
//do a health check, we have no way of verify a
disconnected
//socket since we don't register for OP_READ on
waitForAck=false
- read(key);//this causes overhead
+ read();//this causes overhead
setRequestCount(getRequestCount()+1);
return true;
}
@@ -117,7 +117,7 @@ public class NioSender extends AbstractS
key.interestOps(key.interestOps()|SelectionKey.OP_WRITE);
}//end if
} else if ( key.isReadable() ) {
- boolean readcomplete = read(key);
+ boolean readcomplete = read();
if ( readcomplete ) {
setRequestCount(getRequestCount()+1);
return true;
@@ -160,7 +160,7 @@ public class NioSender extends AbstractS
- protected boolean read(SelectionKey key) throws IOException {
+ protected boolean read() throws IOException {
//if there is no message here, we are done
if ( current == null ) return true;
int read = isUdpBased()?dataChannel.read(readbuf) :
socketChannel.read(readbuf);
@@ -183,7 +183,7 @@ public class NioSender extends AbstractS
}
- protected boolean write(SelectionKey key) throws IOException {
+ protected boolean write() throws IOException {
if ( (!isConnected()) || (this.socketChannel==null &&
this.dataChannel==null)) {
throw new IOException("NioSender is not connected, this should not
occur.");
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=1178005&r1=1178004&r2=1178005&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Sat Oct 1 14:49:59 2011
@@ -309,7 +309,7 @@ public class ParallelNioSender extends A
result = true;
} else {
try {
- sender.read(null);
+ sender.read();
}catch ( IOException x ) {
sender.disconnect();
sender.reset();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
