From: mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 4 Oct 2010 08:52:11 +0000 (+0000)
Subject: Add log.warn if unlockAccept fails to wakeup the listening socket
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3bbbaaea1b329cf24723c532514373b8cc793259;p=tomcat7.0

Add log.warn if unlockAccept fails to wakeup the listening socket

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1004145 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 ce40830b9..8b5df23a5 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -98,7 +98,7 @@ public class AprEndpoint extends AbstractEndpoint {
 
     protected ConcurrentLinkedQueue<SocketWrapper<Long>> waitingRequests =
         new ConcurrentLinkedQueue<SocketWrapper<Long>>();
-    
+
     // ------------------------------------------------------------- Properties
 
 
@@ -619,6 +619,8 @@ public class AprEndpoint extends AbstractEndpoint {
                         // 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 AbstractEndpoint {
                         processSocketAsync(socket,SocketStatus.TIMEOUT);
                     }
                 }
-                
+
                 // Loop if endpoint is paused
                 while (paused && running) {
                     try {
@@ -1001,12 +1003,12 @@ public class AprEndpoint extends AbstractEndpoint {
                         // Ignore
                     }
                 }
-                
+
             }
         }
     }
-    
-    
+
+
     // ----------------------------------------------------- Poller Inner Class
     /**
      * Poller class.
diff --git a/java/org/apache/tomcat/util/net/res/LocalStrings.properties b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
index bb7031616..95c3aa35e 100644
--- a/java/org/apache/tomcat/util/net/res/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
@@ -42,3 +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}]