From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 1 Oct 2011 14:49:59 +0000 (+0000)
Subject: Remove unused parameters
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fac656dab7476d952695cfdcb6e71dd21c904a44;p=tomcat7.0

Remove unused parameters

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1178005 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/tribes/transport/nio/NioSender.java b/java/org/apache/catalina/tribes/transport/nio/NioSender.java
index 8cedb5419..6330f1854 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioSender.java
@@ -98,7 +98,7 @@ public class NioSender extends AbstractSender {
                 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 AbstractSender {
                     //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 AbstractSender {
                 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 AbstractSender {
 
 
 
-    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 AbstractSender {
     }
 
 
-    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.");
         }
diff --git a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
index e855a37ab..7b9e83a0d 100644
--- a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
@@ -309,7 +309,7 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
                 result = true;
             } else {
                 try {
-                    sender.read(null);
+                    sender.read();
                 }catch ( IOException x ) {
                     sender.disconnect();
                     sender.reset();