You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/03/16 14:51:33 UTC
svn commit: r1666997 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
AprEndpoint.java LocalStrings.properties
Author: markt
Date: Mon Mar 16 13:51:33 2015
New Revision: 1666997
URL: http://svn.apache.org/r1666997
Log:
Add debug logging for poller event merge
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/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=1666997&r1=1666996&r2=1666997&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Mar 16 13:51:33 2015
@@ -1932,8 +1932,14 @@ public class AprEndpoint extends Abstrac
*/
HashMap<Long,Long> merged = new HashMap<>(startCount);
for (int n = 0; n < startCount; n++) {
- merged.merge(Long.valueOf(desc[2*n+1]), Long.valueOf(desc[2*n]),
+ Long newValue = merged.merge(Long.valueOf(desc[2*n+1]), Long.valueOf(desc[2*n]),
(v1, v2) -> Long.valueOf(v1.longValue() | v2.longValue()));
+ if (log.isDebugEnabled()) {
+ if (newValue.longValue() != desc[2*n]) {
+ log.debug(sm.getString("endpoint.apr.pollMergeEvents",
+ Long.valueOf(desc[2*n+1]), Long.valueOf(desc[2*n]), newValue));
+ }
+ }
}
int i = 0;
for (Map.Entry<Long,Long> entry : merged.entrySet()) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1666997&r1=1666996&r2=1666997&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon Mar 16 13:51:33 2015
@@ -65,6 +65,7 @@ endpoint.apr.noSendfileWithSSL=Sendfile
endpoint.apr.noSslCertFile=Connector attribute SSLCertificateFile must be defined when using SSL with APR
endpoint.apr.pollAddInvalid=Invalid attempted to add a socket [{0}] to the poller
endpoint.apr.pollError=Poller failed with error [{0}] : [{1}]
+endpoint.apr.pollMergeEvents=Merge poller events [{1}] and [{2}] for socket [{0}]
endpoint.apr.pollUnknownEvent=A socket was returned from the poller with an unrecognized event [{0}]
endpoint.apr.remoteport=APR socket [{0}] opened with remote port [{1}]
endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org