[jbossweb-commits] JBossWeb SVN: r464 - in trunk/java/org/apache/tomcat/util/net: res and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2008-03-04 10:38:27 -0500 (Tue, 04 Mar 2008)
New Revision: 464
Modified:
trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Log:
- Add a specific message for maintain (= timeout processing) errors.
Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-03-04 02:31:01 UTC (rev
463)
+++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-03-04 15:38:27 UTC (rev
464)
@@ -1501,7 +1501,7 @@
while (keepAliveCount < 1 && addList.size() < 1) {
// Reset maintain time.
- maintainTime = 0;
+ maintainTime = 1;
try {
synchronized (this) {
this.wait(10000);
@@ -1512,7 +1512,7 @@
} catch (InterruptedException e) {
// Ignore
} catch (Throwable t) {
- log.error(sm.getString("endpoint.poll.error"), t);
+ log.error(sm.getString("endpoint.maintain.error"), t);
}
}
@@ -1633,10 +1633,15 @@
// non Comet poller might be a bit faster by using the old
maintain.
maintainTime = 0;
maintain();
+ maintainTime = 1;
}
} catch (Throwable t) {
- log.error(sm.getString("endpoint.poll.error"), t);
+ if (maintainTime == 0) {
+ log.error(sm.getString("endpoint.maintain.error"), t);
+ } else {
+ log.error(sm.getString("endpoint.poll.error"), t);
+ }
}
}
Modified: trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties 2008-03-04 02:31:01
UTC (rev 463)
+++ trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties 2008-03-04 15:38:27
UTC (rev 464)
@@ -20,6 +20,7 @@
endpoint.poll.fail=Critical poller failure (restarting poller): [{0}] {1}
endpoint.poll.fail=Socket [{0}] poll event: [{1}] {2}
endpoint.poll.error=Unexpected poller error
+endpoint.maintain.error=Error processing timeouts
endpoint.process.fail=Error allocating socket processor
endpoint.sendfile.error=Unexpected sendfile error
endpoint.sendfile.addfail=Sednfile failure: [{0}] {1}