svn commit: r1641279 - in /tomcat/trunk/java/org/apache/coyote/ajp: AbstractAjpProcessor.java AjpAprProcessor.java AjpNio2Processor.java AjpNioProcessor.java

[markt]

Author: markt
Date: Sun Nov 23 22:50:27 2014
New Revision: 1641279

URL: http://svn.apache.org/r1641279
Log:
Remove unused methods

Modified:
    tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1641279&r1=1641278&r2=1641279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Sun Nov 
23 22:50:27 2014
@@ -726,8 +726,6 @@ public abstract class AbstractAjpProcess
         // Setting up the socket
         this.socketWrapper = socket;
 
-        setupSocket(socket);
-
         int soTimeout = endpoint.getSoTimeout();
         boolean cping = false;
 
@@ -923,10 +921,6 @@ public abstract class AbstractAjpProcess
 
     // ------------------------------------------------------ Protected Methods
 
-    // Methods called by process()
-    protected abstract void setupSocket(SocketWrapperBase<S> socketWrapper)
-            throws IOException;
-
     // Methods used by SocketInputBuffer
     /**
      * Read an AJP body message. Used to read both the 'special' packet in 
ajp13

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1641279&r1=1641278&r2=1641279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun Nov 23 
22:50:27 2014
@@ -19,7 +19,6 @@ package org.apache.coyote.ajp;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.net.AprEndpoint;
-import org.apache.tomcat.util.net.SocketWrapperBase;
 
 /**
  * Processes AJP requests.
@@ -50,10 +49,4 @@ public class AjpAprProcessor extends Abs
         ((AprEndpoint) endpoint).getPoller().add(
                 socketWrapper.getSocket().longValue(), -1, read, write);
     }
-
-
-    @Override
-    protected void setupSocket(SocketWrapperBase<Long> socketWrapper) {
-        // NO-OP
-    }
 }

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java?rev=1641279&r1=1641278&r2=1641279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java Sun Nov 23 
22:50:27 2014
@@ -16,13 +16,10 @@
  */
 package org.apache.coyote.ajp;
 
-import java.io.IOException;
-
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.net.Nio2Channel;
 import org.apache.tomcat.util.net.Nio2Endpoint;
-import org.apache.tomcat.util.net.SocketWrapperBase;
 
 /**
  * Processes AJP requests using NIO2.
@@ -44,11 +41,4 @@ public class AjpNio2Processor extends Ab
         // Nothing to do here, the appropriate operations should
         // already be pending
     }
-
-
-    @Override
-    protected void setupSocket(SocketWrapperBase<Nio2Channel> socketWrapper)
-            throws IOException {
-        // NO-OP
-    }
 }

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1641279&r1=1641278&r2=1641279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Sun Nov 23 
22:50:27 2014
@@ -16,14 +16,12 @@
  */
 package org.apache.coyote.ajp;
 
-import java.io.IOException;
 import java.nio.channels.SelectionKey;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.net.NioChannel;
 import org.apache.tomcat.util.net.NioEndpoint;
-import org.apache.tomcat.util.net.SocketWrapperBase;
 
 /**
  * Processes AJP requests using NIO.
@@ -60,11 +58,4 @@ public class AjpNioProcessor extends Abs
             key.interestOps(key.interestOps() | SelectionKey.OP_READ);
         }
     }
-
-
-    @Override
-    protected void setupSocket(SocketWrapperBase<NioChannel> socketWrapper)
-            throws IOException {
-        // NO-OP
-    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org