From: mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 4 Oct 2010 08:55:12 +0000 (+0000)
Subject: Use better explanation
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5f9d95603b4cedf84a983c479123932569dc5a3f;p=tomcat7.0

Use better explanation

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

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 8b5df23a5..33b977224 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -619,7 +619,7 @@ public class AprEndpoint extends AbstractEndpoint {
                         // Ignore
                     }
                     if (c++ > 60) {
-                        log.warn(sm.getString("endpoint.warn.unlockAcceptFailed",
+                        log.warn(sm.getString("endpoint.warn.unlockAcceptorFailed",
                                  acceptors[i].getName()));
                         // If the Acceptor is still running force
                         // the hard socket close.
diff --git a/java/org/apache/tomcat/util/net/res/LocalStrings.properties b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
index 95c3aa35e..5e7941af9 100644
--- a/java/org/apache/tomcat/util/net/res/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
@@ -42,4 +42,4 @@ endpoint.sendfile.error=Unexpected sendfile error
 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}]
+endpoint.warn.unlockAcceptorFailed=Acceptor thread [{0}] failed to unlock. Forcing hard socket shutdown.