tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1037715 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Date Mon, 22 Nov 2010 13:42:02 GMT
Author: markt
Date: Mon Nov 22 13:42:01 2010
New Revision: 1037715

URL: http://svn.apache.org/viewvc?rev=1037715&view=rev
Log:
Fix https://issues.apache.org/bugzilla/process_bug.cgi
Provide a workaround for an HP-UX issue that can result in large numbers of SEVERE log messages
appearing in the logs as a result of normal operation. 

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
    tomcat/trunk/webapps/docs/changelog.xml

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=1037715&r1=1037714&r2=1037715&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Nov 22 13:42:01 2010
@@ -912,6 +912,7 @@ public class AprEndpoint extends Abstrac
      */
     protected class Acceptor extends Thread {
 
+        private final Log log = LogFactory.getLog(AprEndpoint.Acceptor.class);
 
         /**
          * The background thread that listens for incoming TCP/IP connections and
@@ -954,7 +955,22 @@ public class AprEndpoint extends Abstrac
                     }
                 } catch (Throwable t) {
                     ExceptionUtils.handleThrowable(t);
-                    if (running) log.error(sm.getString("endpoint.accept.fail"), t);
+                    if (running) {
+                        String msg = sm.getString("endpoint.accept.fail");
+                        if (t instanceof Error) {
+                            Error e = (Error) t;
+                            if (e.getError() == 233) {
+                                // Not an error on HP-UX so log as a warning
+                                // so it can be filtered out on that platform
+                                // See bug 50273
+                                log.warn(msg, t);
+                            } else {
+                                log.error(msg, t);
+                            }
+                        } else {
+                                log.error(msg, t);
+                        }
+                    }
                 }
 
                 // The processor will recycle itself when it finishes

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1037715&r1=1037714&r2=1037715&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 22 13:42:01 2010
@@ -197,6 +197,11 @@
         <bug>50192</bug>: Improve performance for EL when running under a
         security manager. Based on a patch by Robert Goff. (markt) 
       </fix>
+      <add>
+        <bug>50273</bug>: Provide a workaround for an HP-UX issue that can
+        result in large numbers of SEVERE log messages appearing in the logs as
+        a result of normal operation. (markt)
+      </add>
       <fix>
         <bug>50293</bug>: Increase the size of internal ELResolver array from
2 
         to 8 since in typical usage there are at least 5 resolvers. Based on a



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message