[Bug 58103] NIO2 warning: Incorrect connection count, multiple socket.close called on the same socket.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58103 --- Comment #3 from Ognjen Blagojevic ognjen.d.blagoje...@gmail.com --- Can I help somehow to get to the root cause of the problem? For instance, to print stack trace and connection count every time AbstractEndpoint.countUpOrAwaitConnection and .countDownConnection is executed? It seems to me that the problem easily reproducible on my environment. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58103] NIO2 warning: Incorrect connection count, multiple socket.close called on the same socket.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58103 --- Comment #4 from Remy Maucherat r...@apache.org --- Feel free to debug it, but as far I am concerned I am probably done with this feature at the moment. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/67 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1692139 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58166] New: Tomcat does not support application-specific close codes
https://bz.apache.org/bugzilla/show_bug.cgi?id=58166 Bug ID: 58166 Summary: Tomcat does not support application-specific close codes Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: minor Priority: P2 Component: WebSocket Assignee: dev@tomcat.apache.org Reporter: b.coughl...@gmail.com org.apache.tomcat.websocket.Util.getCloseCode() converts codes between 3000 and 4999 to 1000. This behaviour is non-standard and differs from the behaviour of javax.websocket.CloseReason$CloseCodes which returns the correct close codes. return new CloseReason.CloseCode() { @Override public int getCode() { return code; } }; -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692139 - in /tomcat/trunk/test/org/apache: catalina/connector/TestMaxConnections.java coyote/http11/upgrade/TestUpgradeInternalHandler.java
Author: remm Date: Tue Jul 21 14:51:22 2015 New Revision: 1692139 URL: http://svn.apache.org/r1692139 Log: Skip maxConnections test, and unskip internal upgrade handler test. Modified: tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java Modified: tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1692139r1=1692138r2=1692139view=diff == --- tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java (original) +++ tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java Tue Jul 21 14:51:22 2015 @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; import org.apache.catalina.core.StandardContext; @@ -39,6 +40,8 @@ public class TestMaxConnections extends @Test public void testConnector() throws Exception { init(); +Assume.assumeFalse(This feature is not available for NIO2 (BZ58103), + getTomcatInstance().getConnector().getProtocolHandlerClassName().contains(Nio2)); ConnectThread[] t = new ConnectThread[10]; for (int i=0; it.length; i++) { t[i] = new ConnectThread(); Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1692139r1=1692138r2=1692139view=diff == --- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java (original) +++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java Tue Jul 21 14:51:22 2015 @@ -60,8 +60,7 @@ public class TestUpgradeInternalHandler public void testUpgradeInternal() throws Exception { Assume.assumeTrue( Only supported on NIO 2, -getTomcatInstance().getConnector().getProtocol() - .equals(org.apache.coyote.http11.Http11Nio2Protocol)); + getTomcatInstance().getConnector().getProtocolHandlerClassName().contains(Nio2)); UpgradeConnection uc = doUpgrade(EchoAsync.class); PrintWriter pw = new PrintWriter(uc.getWriter()); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58042] SlowQueryReport failed query logging
https://bz.apache.org/bugzilla/show_bug.cgi?id=58042 Keiichi Fujino kfuj...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Keiichi Fujino kfuj...@apache.org --- Fixed r1692049, r1692050. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692056 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java webapps/docs/changelog.xml
Author: kfujino Date: Tue Jul 21 07:00:50 2015 New Revision: 1692056 URL: http://svn.apache.org/r1692056 Log: Fix potential NPE in QueryTimeoutInterceptor. Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java?rev=1692056r1=1692055r2=1692056view=diff == --- tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java (original) +++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java Tue Jul 21 07:00:50 2015 @@ -28,12 +28,13 @@ import org.apache.tomcat.jdbc.pool.PoolP public class QueryTimeoutInterceptor extends AbstractCreateStatementInterceptor { private static Log log = LogFactory.getLog(QueryTimeoutInterceptor.class); -int timeout; +int timeout = 1; @Override public void setProperties(MapString,InterceptorProperty properties) { super.setProperties(properties); -timeout = properties.get(queryTimeout).getValueAsInt(-1); +InterceptorProperty p = properties.get(queryTimeout); +if (p!=null) timeout = p.getValueAsInt(timeout); } @Override Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1692056r1=1692055r2=1692056view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 07:00:50 2015 @@ -121,6 +121,9 @@ of codeSlowQueryReport/code is changed to codefalse/code so that the failed queries are not logged by default. (kfujino) /fix + fix +Fix potential NPE in codeQueryTimeoutInterceptor/code. (kfujino) + /fix /changelog /subsection subsection name=Other - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/62 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1692052 Blamelist: kfujino BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/27 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1692056 Blamelist: kfujino BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692057 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java webapps/docs/changelog.xml
Author: kfujino Date: Tue Jul 21 07:01:44 2015 New Revision: 1692057 URL: http://svn.apache.org/r1692057 Log: Fix potential NPE in QueryTimeoutInterceptor. Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java?rev=1692057r1=1692056r2=1692057view=diff == --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java Tue Jul 21 07:01:44 2015 @@ -28,12 +28,13 @@ import org.apache.tomcat.jdbc.pool.PoolP public class QueryTimeoutInterceptor extends AbstractCreateStatementInterceptor { private static Log log = LogFactory.getLog(QueryTimeoutInterceptor.class); -int timeout; +int timeout = 1; @Override public void setProperties(MapString,InterceptorProperty properties) { super.setProperties(properties); -timeout = properties.get(queryTimeout).getValueAsInt(-1); +InterceptorProperty p = properties.get(queryTimeout); +if (p!=null) timeout = p.getValueAsInt(timeout); } @Override Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1692057r1=1692056r2=1692057view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 07:01:44 2015 @@ -118,6 +118,13 @@ /fix /changelog /subsection + subsection name=jdbc-pool +changelog + fix +Fix potential NPE in codeQueryTimeoutInterceptor/code. (kfujino) + /fix +/changelog + /subsection subsection name=Other changelog fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-7-trunk
2015-07-21 10:08 GMT+03:00 build...@apache.org: The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/17 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1692054 Blamelist: kfujino BUILD FAILED: failed compile_1 There is compilation failure during testing, test-compile: [mkdir] Created dir: /home/buildslave32/slave32/tomcat-7-trunk/build/output/testclasses [javac] Compiling 286 source files to /home/buildslave32/slave32/tomcat-7-trunk/build/output/testclasses [javac] /home/buildslave32/slave32/tomcat-7-trunk/build/test/org/apache/catalina/ant/TestDeployTask.java:29: package org.apache.tools.ant does not exist [javac] import org.apache.tools.ant.BuildException; [javac]^ [javac] /home/buildslave32/slave32/tomcat-7-trunk/build/test/org/apache/catalina/ant/TestDeployTask.java:64: cannot find symbol [javac] symbol : class BuildException [javac] location: class org.apache.catalina.ant.TestDeployTask [javac] @Test(expected = BuildException.class) [javac] ^ [javac] /home/buildslave32/slave32/tomcat-7-trunk/build/test/org/apache/catalina/ant/TestDeployTask.java:71: cannot find symbol [...] This is not a new error. There have been no (zero) successful builds of TC7 since July 01st when buildbot master was reconfigured. Apparently javac task in test-compile target needs s/ includeantruntime=false / includeAntRuntime=true / Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692054 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/doc/jdbc-pool.xml webapps/docs/changelog.xml
Author: kfujino Date: Tue Jul 21 06:48:52 2015 New Revision: 1692054 URL: http://svn.apache.org/r1692054 Log: Correct the incorrect document of QueryTimeoutInterceptor. The setting value is not in milliseconds but in seconds. Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1692054r1=1692053r2=1692054view=diff == --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Jul 21 06:48:52 2015 @@ -649,8 +649,9 @@ /p attributes attribute name=queryTimeout required=true -p(int as String) The number of seconds to set for the query timeout - The default value is code1000/code milliseconds. +p(int as String) The number of seconds to set for the query timeout. + A value less than or equal to zero will disable this feature. + The default value is code1/code seconds. /p /attribute /attributes Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1692054r1=1692053r2=1692054view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 06:48:52 2015 @@ -110,6 +110,14 @@ /fix /changelog /subsection + subsection name=Web applications +changelog + fix +Correct the incorrect document of codeQueryTimeoutInterceptor/code. +The setting value is not in milliseconds but in seconds. (kfujino) + /fix +/changelog + /subsection subsection name=Other changelog fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692053 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/doc/jdbc-pool.xml webapps/docs/changelog.xml
Author: kfujino Date: Tue Jul 21 06:47:24 2015 New Revision: 1692053 URL: http://svn.apache.org/r1692053 Log: Correct the incorrect document of QueryTimeoutInterceptor. The setting value is not in milliseconds but in seconds. Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1692053r1=1692052r2=1692053view=diff == --- tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Jul 21 06:47:24 2015 @@ -675,8 +675,9 @@ /p attributes attribute name=queryTimeout required=true -p(int as String) The number of seconds to set for the query timeout - The default value is code1000/code milliseconds. +p(int as String) The number of seconds to set for the query timeout. + A value less than or equal to zero will disable this feature. + The default value is code1/code seconds. /p /attribute /attributes Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1692053r1=1692052r2=1692053view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 06:47:24 2015 @@ -106,6 +106,14 @@ /fix /changelog /subsection + subsection name=Web applications +changelog + fix +Correct the incorrect document of codeQueryTimeoutInterceptor/code. +The setting value is not in milliseconds but in seconds. (kfujino) + /fix +/changelog + /subsection subsection name=jdbc-pool changelog fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/17 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1692054 Blamelist: kfujino BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692095 - /tomcat/tc7.0.x/trunk/build.xml
Author: violetagg Date: Tue Jul 21 12:16:30 2015 New Revision: 1692095 URL: http://svn.apache.org/r1692095 Log: Fixed the tests compilation. Applied feedback by kkolinko. Modified: tomcat/tc7.0.x/trunk/build.xml Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1692095r1=1692094r2=1692095view=diff == --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Tue Jul 21 12:16:30 2015 @@ -1315,7 +1315,7 @@ source=${compile.source} target=${compile.target} encoding=ISO-8859-1 - includeantruntime=false + includeantruntime=true classpath refid=tomcat.test.classpath / include name=org/apache/** / include name=javax/** / - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-7-trunk
Hi, 2015-07-21 13:33 GMT+03:00 Konstantin Kolinko knst.koli...@gmail.com: 2015-07-21 10:08 GMT+03:00 build...@apache.org: The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/17 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1692054 Blamelist: kfujino BUILD FAILED: failed compile_1 There is compilation failure during testing, test-compile: [mkdir] Created dir: /home/buildslave32/slave32/tomcat-7-trunk/build/output/testclasses [javac] Compiling 286 source files to /home/buildslave32/slave32/tomcat-7-trunk/build/output/testclasses [javac] /home/buildslave32/slave32/tomcat-7-trunk/build/test/org/apache/catalina/ant/TestDeployTask.java:29: package org.apache.tools.ant does not exist [javac] import org.apache.tools.ant.BuildException; [javac]^ [javac] /home/buildslave32/slave32/tomcat-7-trunk/build/test/org/apache/catalina/ant/TestDeployTask.java:64: cannot find symbol [javac] symbol : class BuildException [javac] location: class org.apache.catalina.ant.TestDeployTask [javac] @Test(expected = BuildException.class) [javac] ^ [javac] /home/buildslave32/slave32/tomcat-7-trunk/build/test/org/apache/catalina/ant/TestDeployTask.java:71: cannot find symbol [...] This is not a new error. There have been no (zero) successful builds of TC7 since July 01st when buildbot master was reconfigured. Apparently javac task in test-compile target needs s/ includeantruntime=false / includeAntRuntime=true / I fixed it. Thanks, Violeta Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58151] High CPU Usage randomly on ajp-apr-8009-Poller
https://bz.apache.org/bugzilla/show_bug.cgi?id=58151 Ari Luoma arilu...@gmail.com changed: What|Removed |Added CC||arilu...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1692057 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java webapps/docs/changelog.xml
2015-07-21 10:01 GMT+03:00 kfuj...@apache.org: Author: kfujino Date: Tue Jul 21 07:01:44 2015 New Revision: 1692057 URL: http://svn.apache.org/r1692057 Log: Fix potential NPE in QueryTimeoutInterceptor. Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java?rev=1692057r1=1692056r2=1692057view=diff == --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java Tue Jul 21 07:01:44 2015 @@ -28,12 +28,13 @@ import org.apache.tomcat.jdbc.pool.PoolP public class QueryTimeoutInterceptor extends AbstractCreateStatementInterceptor { private static Log log = LogFactory.getLog(QueryTimeoutInterceptor.class); -int timeout; +int timeout = 1; @Override public void setProperties(MapString,InterceptorProperty properties) { super.setProperties(properties); -timeout = properties.get(queryTimeout).getValueAsInt(-1); +InterceptorProperty p = properties.get(queryTimeout); +if (p!=null) timeout = p.getValueAsInt(timeout); Old code has default value of -1. The new code has default value of +1. } @Override Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1692057r1=1692056r2=1692057view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 07:01:44 2015 @@ -118,6 +118,13 @@ /fix /changelog /subsection + subsection name=jdbc-pool +changelog + fix +Fix potential NPE in codeQueryTimeoutInterceptor/code. (kfujino) + /fix +/changelog + /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692049 - in /tomcat/trunk/modules/jdbc-pool: doc/jdbc-pool.xml src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
Author: kfujino Date: Tue Jul 21 06:17:46 2015 New Revision: 1692049 URL: http://svn.apache.org/r1692049 Log: The default value of logFailed attribute of SlowQueryReport is changed to false. Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1692049r1=1692048r2=1692049view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Jul 21 06:17:46 2015 @@ -703,7 +703,7 @@ /attribute attribute name=logFailed required=false p(boolean as String) Set to codetrue/code if you wish to log failed queries. -The default value is codetrue/code. +The default value is codefalse/code. /p /attribute /attributes Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1692049r1=1692048r2=1692049view=diff == --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java Tue Jul 21 06:17:46 2015 @@ -67,7 +67,7 @@ public class SlowQueryReport extends Abs /** * Flag to enable disable logging of failed queries */ -protected boolean logFailed = true; +protected boolean logFailed = false; /** * Sort QueryStats by last invocation time - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692050 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/doc/jdbc-pool.xml modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java webapps/docs/changelog
Author: kfujino Date: Tue Jul 21 06:21:05 2015 New Revision: 1692050 URL: http://svn.apache.org/r1692050 Log: The default value of logFailed attribute of SlowQueryReport is changed to false. Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1692050r1=1692049r2=1692050view=diff == --- tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Jul 21 06:21:05 2015 @@ -703,7 +703,7 @@ /attribute attribute name=logFailed required=false p(boolean as String) Set to codetrue/code if you wish to log failed queries. -The default value is codetrue/code. +The default value is codefalse/code. /p /attribute /attributes Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1692050r1=1692049r2=1692050view=diff == --- tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java (original) +++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java Tue Jul 21 06:21:05 2015 @@ -67,7 +67,7 @@ public class SlowQueryReport extends Abs /** * Flag to enable disable logging of failed queries */ -protected boolean logFailed = true; +protected boolean logFailed = false; /** * Sort QueryStats by last invocation time Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1692050r1=1692049r2=1692050view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 06:21:05 2015 @@ -106,6 +106,15 @@ /fix /changelog /subsection + subsection name=jdbc-pool +changelog + fix +bug58042/bug: The default value of codelogFailed/code attribute +of codeSlowQueryReport/code is changed to codefalse/code so that +the failed queries are not logged by default. (kfujino) + /fix +/changelog + /subsection subsection name=Other changelog update - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692055 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
Author: kfujino Date: Tue Jul 21 06:59:57 2015 New Revision: 1692055 URL: http://svn.apache.org/r1692055 Log: Fix potential NPE in QueryTimeoutInterceptor. Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java?rev=1692055r1=1692054r2=1692055view=diff == --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java Tue Jul 21 06:59:57 2015 @@ -28,12 +28,13 @@ import org.apache.tomcat.jdbc.pool.PoolP public class QueryTimeoutInterceptor extends AbstractCreateStatementInterceptor { private static Log log = LogFactory.getLog(QueryTimeoutInterceptor.class); -int timeout; +int timeout = 1; @Override public void setProperties(MapString,InterceptorProperty properties) { super.setProperties(properties); -timeout = properties.get(queryTimeout).getValueAsInt(-1); +InterceptorProperty p = properties.get(queryTimeout); +if (p!=null) timeout = p.getValueAsInt(timeout); } @Override - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692121 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm Date: Tue Jul 21 14:07:58 2015 New Revision: 1692121 URL: http://svn.apache.org/r1692121 Log: Since this is still failing and I cannot figure out why, disable maxConnections for NIO2 since it seems counter productive. Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1692121r1=1692120r2=1692121view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Jul 21 14:07:58 2015 @@ -195,6 +195,10 @@ public class Nio2Endpoint extends Abstra // NIO2 does not allow any form of IO concurrency acceptorThreadCount = 1; } +// Disable maxConnections feature, mostly designed for APR rather than NIO2, and has issues (BZ58103) +if (getMaxConnections() != -1) { +setMaxConnections(-1); +} // Initialize SSL if needed initialiseSsl(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692052 - /tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
Author: kfujino Date: Tue Jul 21 06:46:07 2015 New Revision: 1692052 URL: http://svn.apache.org/r1692052 Log: Correct the incorrect document of QueryTimeoutInterceptor. The setting value is not in milliseconds but in seconds. Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1692052r1=1692051r2=1692052view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Jul 21 06:46:07 2015 @@ -675,8 +675,9 @@ /p attributes attribute name=queryTimeout required=true -p(int as String) The number of seconds to set for the query timeout - The default value is code1000/code milliseconds. +p(int as String) The number of seconds to set for the query timeout. + A value less than or equal to zero will disable this feature. + The default value is code1/code seconds. /p /attribute /attributes - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/64 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1692107 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692112 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm Date: Tue Jul 21 13:36:34 2015 New Revision: 1692112 URL: http://svn.apache.org/r1692112 Log: Remove redundant comment (trigger another CI run). Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1692112r1=1692111r2=1692112view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Jul 21 13:36:34 2015 @@ -338,7 +338,6 @@ public class Nio2Endpoint extends Abstra * Process the specified connection. */ protected boolean setSocketOptions(AsynchronousSocketChannel socket) { -// Process the connection try { socketProperties.setProperties(socket); Nio2Channel channel = nioChannels.pop(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1692107 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm Date: Tue Jul 21 13:18:30 2015 New Revision: 1692107 URL: http://svn.apache.org/r1692107 Log: Continue cleaning up the accept algorithm. Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1692107r1=1692106r2=1692107view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Jul 21 13:18:30 2015 @@ -341,7 +341,6 @@ public class Nio2Endpoint extends Abstra // Process the connection try { socketProperties.setProperties(socket); - Nio2Channel channel = nioChannels.pop(); if (channel == null) { SocketBufferHandler bufhandler = new SocketBufferHandler( @@ -363,18 +362,13 @@ public class Nio2Endpoint extends Abstra socketWrapper.setReadTimeout(getSoTimeout()); socketWrapper.setWriteTimeout(getSoTimeout()); // Continue processing on another thread -processSocket(socketWrapper, SocketStatus.OPEN_READ, true); +return processSocket0(socketWrapper, SocketStatus.OPEN_READ, true); } catch (Throwable t) { ExceptionUtils.handleThrowable(t); -try { -log.error(,t); -} catch (Throwable tt) { -ExceptionUtils.handleThrowable(t); -} -// Tell to close the socket -return false; +log.error(,t); } -return true; +// Tell to close the socket +return false; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/19 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1692095 Blamelist: violetagg Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58103] NIO2 warning: Incorrect connection count, multiple socket.close called on the same socket.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58103 --- Comment #2 from Remy Maucherat r...@apache.org --- This would happen occasionally for me. Now this doesn't but it still does rarely in the CI runs. I cannot figure out why it still fails after my fixes. Since it doesn't look like a very useful feature for NIO2 which should scale efficiently, I disabled maxConnections in that endpoint in trunk (forced to -1). Feel free to look into it if you think a fix would be useful. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/66 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1692121 Blamelist: remm BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org