You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2010/10/04 10:52:11 UTC
svn commit: r1004145 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
AprEndpoint.java res/LocalStrings.properties
Author: mturk
Date: Mon Oct 4 08:52:11 2010
New Revision: 1004145
URL: http://svn.apache.org/viewvc?rev=1004145&view=rev
Log:
Add log.warn if unlockAccept fails to wakeup the listening socket
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
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=1004145&r1=1004144&r2=1004145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 4 08:52:11 2010
@@ -98,7 +98,7 @@ public class AprEndpoint extends Abstrac
protected ConcurrentLinkedQueue<SocketWrapper<Long>> waitingRequests =
new ConcurrentLinkedQueue<SocketWrapper<Long>>();
-
+
// ------------------------------------------------------------- Properties
@@ -619,6 +619,8 @@ public class AprEndpoint extends Abstrac
// Ignore
}
if (c++ > 60) {
+ log.warn(sm.getString("endpoint.warn.unlockAcceptFailed",
+ acceptors[i].getName()));
// If the Acceptor is still running force
// the hard socket close.
if (serverSock != 0) {
@@ -992,7 +994,7 @@ public class AprEndpoint extends Abstrac
processSocketAsync(socket,SocketStatus.TIMEOUT);
}
}
-
+
// Loop if endpoint is paused
while (paused && running) {
try {
@@ -1001,12 +1003,12 @@ public class AprEndpoint extends Abstrac
// Ignore
}
}
-
+
}
}
}
-
-
+
+
// ----------------------------------------------------- Poller Inner Class
/**
* Poller class.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=1004145&r1=1004144&r2=1004145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties Mon Oct 4 08:52:11 2010
@@ -42,3 +42,4 @@ endpoint.sendfile.error=Unexpected sendf
endpoint.sendfile.addfail=Sendfile failure: [{0}] {1}
endpoint.sendfile.nosupport=Disabling sendfile, since either the APR version or the system doesn't support it
endpoint.warn.noInsecureReneg=Secure renegotation is not supported by the SSL library {0}
+endpoint.warn.unlockAcceptFailed=unlockAccept call failed for Acceptor thread [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org