Author: markt
Date: Wed Dec 7 21:58:38 2016
New Revision: 1773155
URL: http://svn.apache.org/viewvc?rev=1773155&view=rev
Log:
Simplify Acceptor creation.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1773155&r1=1773154&r2=1773155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Wed Dec
7 21:58:38 2016
@@ -932,12 +932,13 @@ public abstract class AbstractEndpoint<S
startInternal();
}
+
protected final void startAcceptorThreads() {
int count = getAcceptorThreadCount();
acceptors = new ArrayList<>(count);
for (int i = 0; i < count; i++) {
- Acceptor<U> acceptor = createAcceptor();
+ Acceptor<U> acceptor = new Acceptor<>(this);
String threadName = getName() + "-Acceptor-" + i;
acceptor.setThreadName(threadName);
acceptors.add(acceptor);
@@ -950,13 +951,6 @@ public abstract class AbstractEndpoint<S
/**
- * Hook to allow Endpoints to provide a specific Acceptor implementation.
- * @return the acceptor
- */
- protected abstract Acceptor<U> createAcceptor();
-
-
- /**
* Pause the endpoint, which will stop it accepting new connections.
*/
public void pause() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1773155&r1=1773154&r2=1773155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Dec 7
21:58:38 2016
@@ -722,12 +722,6 @@ public class AprEndpoint extends Abstrac
// ------------------------------------------------------ Protected Methods
- @Override
- protected Acceptor<Long> createAcceptor() {
- return new Acceptor<>(this);
- }
-
-
/**
* Process the specified connection.
* @param socketWrapper The socket wrapper
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1773155&r1=1773154&r2=1773155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed Dec 7
21:58:38 2016
@@ -277,11 +277,6 @@ public class Nio2Endpoint extends Abstra
// ------------------------------------------------------ Protected Methods
- @Override
- protected Acceptor<AsynchronousSocketChannel> createAcceptor() {
- return new Acceptor<>(this);
- }
-
/**
* Process the specified connection.
* @param socket The socket channel
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1773155&r1=1773154&r2=1773155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Dec 7
21:58:38 2016
@@ -330,12 +330,6 @@ public class NioEndpoint extends Abstrac
}
- @Override
- protected Acceptor<SocketChannel> createAcceptor() {
- return new Acceptor<>(this);
- }
-
-
/**
* Process the specified connection.
* @param socket The socket channel
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
