Author: markt
Date: Thu Apr 13 13:37:08 2017
New Revision: 1791252
URL: http://svn.apache.org/viewvc?rev=1791252&view=rev
Log:
Remove unnecessary calls to unlockAccept()
The prior call to pause() will take care of this.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.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=1791252&r1=1791251&r2=1791252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Apr
13 13:37:08 2017
@@ -756,9 +756,9 @@ public abstract class AbstractEndpoint<S
}
/**
- * Unlock the server socket accept using a bogus connection.
+ * Unlock the server socket acceptor threads using bogus connections.
*/
- protected void unlockAccept() {
+ private void unlockAccept() {
// Only try to unlock the acceptor if it is necessary
int unlocksRequired = 0;
for (Acceptor<U> acceptor : acceptors) {
@@ -980,7 +980,8 @@ public abstract class AbstractEndpoint<S
/**
- * Pause the endpoint, which will stop it accepting new connections.
+ * Pause the endpoint, which will stop it accepting new connections and
+ * unlock the acceptor.
*/
public void pause() {
if (running && !paused) {
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=1791252&r1=1791251&r2=1791252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Apr 13
13:37:08 2017
@@ -196,7 +196,6 @@ public class Nio2Endpoint extends Abstra
}
if (running) {
running = false;
- unlockAccept();
// Use the executor to avoid binding the main thread if something
bad
// occurs and unbind will also wait for a bit for it to complete
getExecutor().execute(new Runnable() {
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=1791252&r1=1791251&r2=1791252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Apr 13
13:37:08 2017
@@ -273,7 +273,6 @@ public class NioEndpoint extends Abstrac
}
if (running) {
running = false;
- unlockAccept();
for (int i=0; pollers!=null && i<pollers.length; i++) {
if (pollers[i]==null) continue;
pollers[i].destroy();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
