[Bug 61825] Tomcat8.0.30 Async request happend memory leak

2017-11-27 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61825

--- Comment #3 from Gavin.peng  ---
Created attachment 35559
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35559&action=edit
the async request asyncStateMachine state

all the async request the statemachine is completing

-- 
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 61825] Tomcat8.0.30 Async request happend memory leak

2017-11-27 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61825

--- Comment #2 from Gavin.peng  ---
the asyncState all is COMPLETING of the all async request asyncstateMachine,why
is not end after timeout by tomcat container

-- 
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 61825] Tomcat8.0.30 Async request happend memory leak

2017-11-27 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61825

--- Comment #1 from Gavin.peng  ---
Created attachment 35558
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35558&action=edit
request and response is not release maybe the concurrenthashmap reflence

-- 
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 61825] New: Tomcat8.0.30 Async request happend memory leak

2017-11-27 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61825

Bug ID: 61825
   Summary: Tomcat8.0.30 Async request happend memory leak
   Product: Tomcat 8
   Version: 8.0.30
  Hardware: All
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: ronxin...@163.com
  Target Milestone: 

Created attachment 35557
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35557&action=edit
the Http11ConnectionHandler concurrentHashmap contain too may request

I am use tomcat8.0.30,use the async function,programe running a fews day,
found the full gc is runnig all the time,but memory is not clean up,i dump the
memory analyse by eclipse mat found the follow result:

Request,Response,Nio2Channels and so an,the object is top big object.

19,289 instances of "org.apache.tomcat.util.net.Nio2Channel", loaded by
"java.net.URLClassLoader @ 0x730cc4d58" occupy 319,430,000 (11.05%) bytes.
These instances are referenced from one instance of
"java.util.concurrent.ConcurrentHashMap$Segment[]", loaded by ""

Keywords
one 
19,488 instances of "org.apache.catalina.connector.Response", loaded by
"java.net.URLClassLoader @ 0x730cc4d58" occupy 493,942,352 (17.09%) bytes.
These instances are referenced from one instance of "java.lang.Object[]",
loaded by ""

two:
19,488 instances of "org.apache.catalina.connector.Request", loaded by
"java.net.URLClassLoader @ 0x730cc4d58" occupy 474,043,792 (16.40%) bytes.
These instances are referenced from one instance of "java.lang.Object[]",
loaded by ""

three:
19,289 instances of "org.apache.tomcat.util.net.Nio2Channel", loaded by
"java.net.URLClassLoader @ 0x730cc4d58" occupy 319,430,000 (11.05%) bytes.
These instances are referenced from one instance of
"java.util.concurrent.ConcurrentHashMap$Segment[]", loaded by ""

all memory size is 2.1G,tomcat async request and response and Nio2Channel
occupy 1.8G memory，maybe the Nio2Channel,has a concurrentHashMap,the map
reflence too may Http11Nio2Processor

My switch the request to other server,the tomcat async request and response is
can't clean by gc,so i guess the tomcat is memory leak may be.

-- 
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: r1816505 - in /tomcat/tc8.5.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 22:30:03 2017
New Revision: 1816505

URL: http://svn.apache.org/viewvc?rev=1816505&view=rev
Log:
Bump version for next dev cycle

Modified:
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1816505&r1=1816504&r2=1816505&view=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Mon Nov 27 22:30:03 2017
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=24
+version.build=25
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default?rev=1816505&r1=1816504&r2=1816505&view=diff
==
--- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Mon Nov 27 22:30:03 
2017
@@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.24
+maven.asf.release.deploy.version=8.5.25
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1816505&r1=1816504&r2=1816505&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Nov 27 22:30:03 2017
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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

Re: [VOTE] Release Apache Tomcat 8.5.24

2017-11-27 Thread Emmanuel Bourg 
Le 27/11/2017 à 14:46, Mark Thomas a écrit :

> The proposed 8.5.24 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.24

+1, I successfully ran the 3 test suites on Debian with OpenJDK 8.
With OpenJDK 9 I got an illegal reflective access warning in
WebappClassLoaderBase and a test failure with TestStandardJarScanner:

Testcase: testWebappClassPath took 0.059 sec
FAILED
Unexpected class loader type: jdk.internal.loader.ClassLoaders$AppClassLoader
junit.framework.AssertionFailedError: Unexpected class loader type: 
jdk.internal.loader.ClassLoaders$AppClassLoader
at 
org.apache.tomcat.util.scan.TestStandardJarScanner.testWebappClassPath(TestStandardJarScanner.java:74)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)

Emmanuel Bourg

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

svn commit: r23293 [1/2] - in /dev/tomcat/tomcat-8/v8.5.24: ./ bin/ bin/embed/ bin/extras/ src/

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 13:51:55 2017
New Revision: 23293

Log:
Upload 8.5.24 for voting

Added:
dev/tomcat/tomcat-8/v8.5.24/
dev/tomcat/tomcat-8/v8.5.24/KEYS
dev/tomcat/tomcat-8/v8.5.24/README.html
dev/tomcat/tomcat-8/v8.5.24/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.24/bin/
dev/tomcat/tomcat-8/v8.5.24/bin/README.html
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.zip.md5
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.zip.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-fulldocs.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x64.zip.md5
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x64.zip.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x86.zip.md5
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x86.zip.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.exe   (with props)
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.exe.asc
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.exe.md5
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.exe.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.exe.sha512
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.zip   (with props)
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.zip.asc
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.zip.md5
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.zip.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.zip.sha512
dev/tomcat/tomcat-8/v8.5.24/bin/embed/
dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.md5
dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/extras/
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-8/v8.5.24/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-8/v8.5.24/src/
dev/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.t

svn commit: r23293 [2/2] - in /dev/tomcat/tomcat-8/v8.5.24: ./ bin/ bin/embed/ bin/extras/ src/

2017-11-27 Thread markt 
Added: dev/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.zip.sha1
==
--- dev/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.zip.sha1 (added)
+++ dev/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.zip.sha1 Mon Nov 
27 13:51:55 2017
@@ -0,0 +1 @@
+e5d85fe86a2c4c4f6ae7e737d7ab912d7e0b875c *apache-tomcat-8.5.24-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.zip.sha512 Mon Nov 
27 13:51:55 2017
@@ -0,0 +1 @@
+be4ca9b1d4903ae87ffcb63d13fb4722be9e6d28722a47bad57103bbda4ec49e990bd197fb9e3508a79334d27e1db4677434d40336b326a66524af69db999a38
 *apache-tomcat-8.5.24-src.zip
\ No newline at end of file



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

[VOTE] Release Apache Tomcat 8.5.24

2017-11-27 Thread Mark Thomas 
The proposed Apache Tomcat 8.5.24 release is now available for voting.

The major changes compared to the 8.5.23 release are:

- Java 9 is fully supported

- Fixed a number of HTTP/2 issues

- Fixed numerous JASPIC issues with patches from Lazar

- Update the packaged version of the Tomcat Native Library to
  1.2.16 to pick up the latest Windows binaries built with
  APR 1.6.3 and OpenSSL 1.0.2m


Along with lots of other bug fixes and improvements.


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1161/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_24/

The proposed 8.5.24 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.24

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

svn commit: r1816449 - in /tomcat/trunk: modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ res/findbugs/

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 12:53:37 2017
New Revision: 1816449

URL: http://svn.apache.org/viewvc?rev=1816449&view=rev
Log:
Fix SpotBugs issues (up to rank 16) in JDBC pool

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java?rev=1816449&r1=1816448&r2=1816449&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
 Mon Nov 27 12:53:37 2017
@@ -61,9 +61,11 @@ public class MultipleCloseTest extends D
 Assert.assertTrue(con1.isClosed());
 
 // Open a new connection (This will re-use the previous pooled 
connection)
-datasource.getConnection();
+Connection con2 = datasource.getConnection();
 
 // A connection, once closed, should stay closed
 Assert.assertTrue(con1.isClosed());
+
+con2.close();
 }
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java?rev=1816449&r1=1816448&r2=1816449&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
 Mon Nov 27 12:53:37 2017
@@ -82,6 +82,7 @@ public class StarvationTest extends Defa
 }finally {
 if (con2!=null) con2.close();
 }
+con1.close();
 }
 
 @Test
@@ -104,5 +105,6 @@ public class StarvationTest extends Defa
 }finally {
 if (con2!=null) con2.close();
 }
+con1.close();
 }
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java?rev=1816449&r1=1816448&r2=1816449&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
 Mon Nov 27 12:53:37 2017
@@ -17,7 +17,9 @@
 package org.apache.tomcat.jdbc.test;
 
 import java.sql.Connection;
+import java.sql.Statement;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.tomcat.jdbc.pool.ConnectionPool;
@@ -30,11 +32,11 @@ public class TestException extends Defau
 public void testException() throws Exception {
 
datasource.getPoolProperties().setJdbcInterceptors(TestInterceptor.class.getName());
 Connection con = datasource.getConnection();
-try {
-con.createStatement();
-}catch (Exception x) {
-// Ignore
+try (Statement s = con.createStatement()){
+} catch (Exception x) {
+Assert.fail();
 }
+con.close();
 }
 
 
@@ -42,7 +44,7 @@ public class TestException extends Defau
 
 @Override
 public void reset(ConnectionPool parent, PooledConnection con) {
-// TODO Auto-generated method stub
+// NO-OP
 }
 }
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java?rev=1816449&r1=1816448&r2=1816449&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java
 Mon Nov 27 12:53:37 2017
@@ -88,6

svn commit: r1816448 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_24: ./ build.properties.default webapps/docs/changelog.xml

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 12:49:13 2017
New Revision: 1816448

URL: http://svn.apache.org/viewvc?rev=1816448&view=rev
Log:
Tag 8.5.24

Added:
tomcat/tc8.5.x/tags/TOMCAT_8_5_24/   (props changed)
  - copied from r1816447, tomcat/tc8.5.x/trunk/
Modified:
tomcat/tc8.5.x/tags/TOMCAT_8_5_24/build.properties.default
tomcat/tc8.5.x/tags/TOMCAT_8_5_24/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_24/
--
bugtraq:append = false

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_24/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_24/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Nov 27 12:49:13 2017
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_24/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_24/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_24/
--
--- svn:ignore (added)
+++ svn:ignore Mon Nov 27 12:49:13 2017
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_24/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 27 12:49:13 2017
@@ -0,0 +1,2 @@
+/tomcat/tc8.0.x/trunk:1809644
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,

svn commit: r1816444 - in /tomcat/tc8.5.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 12:41:54 2017
New Revision: 1816444

URL: http://svn.apache.org/viewvc?rev=1816444&view=rev
Log:
Fix failing unit tests

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 27 12:41:54 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,176356

svn commit: r1816443 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 12:41:20 2017
New Revision: 1816443

URL: http://svn.apache.org/viewvc?rev=1816443&view=rev
Log:
Fix failing unit tests

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

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=1816443&r1=1816442&r2=1816443&view=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
 Mon Nov 27 12:41:20 2017
@@ -479,7 +479,8 @@ public class SlowQueryReport extends Abs
  * have never been updated, have a lastInvocation value of {@code 0}
  * which should be handled as the newest possible invocation.
  */
-private static class QueryStatsComparator implements 
Comparator {
+// Public for unit tests
+public static class QueryStatsComparator implements Comparator 
{
 
 @Override
 public int compare(QueryStats stats1, QueryStats stats2) {



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

svn commit: r1816434 - in /tomcat/tc8.5.x/trunk: ./ modules/jdbc-pool/build.properties.default modules/jdbc-pool/build.xml

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 11:16:11 2017
New Revision: 1816434

URL: http://svn.apache.org/viewvc?rev=1816434&view=rev
Log:
Fix download location.
Get h2 JAR from Maven Central rather than the now closed Google code

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default
tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 27 11:16:11 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462

svn commit: r1816433 - /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 11:14:17 2017
New Revision: 1816433

URL: http://svn.apache.org/viewvc?rev=1816433&view=rev
Log:
Fix a SpotBugs warning

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java?rev=1816433&r1=1816432&r2=1816433&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
 Mon Nov 27 11:14:17 2017
@@ -107,8 +107,8 @@ public class Bug53367 {
 Thread thread = new Thread(new Runnable() {
 @Override
 public void run() {
-try {
-ds.getConnection();
+// Expected to fail
+try (Connection c = ds.getConnection()) {
 } catch (Exception e) {
 System.err.println("Step 2:"+e.getMessage());
 }



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

svn commit: r1816431 - in /tomcat/trunk/modules/jdbc-pool: build.properties.default build.xml

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 11:11:08 2017
New Revision: 1816431

URL: http://svn.apache.org/viewvc?rev=1816431&view=rev
Log:
Fix download location.
Get h2 JAR from Maven Central rather than the now closed Google code

Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/build.xml

Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1816431&r1=1816430&r2=1816431&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Mon Nov 27 11:11:08 
2017
@@ -95,6 +95,7 @@ derby.home=${base.path}/db-derby-10.5.1.
 
derby.loc=http://archive.apache.org/dist/db/derby/db-derby-10.5.1.1/db-derby-10.5.1.1-bin.tar.gz
 derby.jar=${derby.home}/lib/derby.jar
 
-h2.home=${base.path}/h2
-h2.loc=http://h2database.googlecode.com/files/h2-2010-02-19.zip
-h2.jar=${h2.home}/bin/h2-1.2.129.jar
+h2.version=1.2.129
+h2.home=${base.path}/h2-${h2.version}
+h2.loc=http://repo.maven.apache.org/maven2/com/h2database/h2/1.2.129/h2-1.2.129.jar
+h2.jar=${h2.home}/h2-1.2.129.jar

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1816431&r1=1816430&r2=1816431&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Mon Nov 27 11:11:08 2017
@@ -397,10 +397,10 @@
   
 
  -->
-
+
   
   
-  
+  
 
 
   
@@ -424,10 +424,10 @@
   
 
  -->
-
+
   
   
-  
+  
 
 
   



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

Re: [VOTE] Release Apache Tomcat 9.0.2

2017-11-27 Thread Mark Thomas 
On 27/11/17 10:40, Rémy Maucherat wrote:
> On Sat, Nov 25, 2017 at 10:36 PM, Mark Thomas  wrote:
> 
>> - Fixed numerous JASPIC issues with patches from Lazar
>>
> 
> I would have mentioned all the HTTP/2 fixes instead personally :)

Good point. I'll add a bullet point to the release announcement for
those. Something like:

- Fixed a number of HTTP/2 issues

?

Mark

> 
> 
>>
>> Along with lots of other bug fixes and improvements.
>>
>>
>> For full details, see the changelog:
>> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>>
>> It can be obtained from:
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.2/
>> The Maven staging repo is:
>> https://repository.apache.org/content/repositories/orgapachetomcat-1160/
>> The svn tag is:
>> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_2/
>>
>> The proposed 9.0.2 release is:
>> [ ] Broken - do not release
>> [ ] Alpha  - go ahead and release as 9.0.2
>> [X] Beta   - go ahead and release as 9.0.2
>> [ ] Stable - go ahead and release as 9.0.2
>>
> 
> I think important features got stressed tested and fixed this time (push,
> in particular), so it might be good enough for stable.
> 
> Rémy
> 


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

Re: [VOTE] Release Apache Tomcat 9.0.2

2017-11-27 Thread Rémy Maucherat 
On Sat, Nov 25, 2017 at 10:36 PM, Mark Thomas  wrote:

> - Fixed numerous JASPIC issues with patches from Lazar
>

I would have mentioned all the HTTP/2 fixes instead personally :)


>
> Along with lots of other bug fixes and improvements.
>
>
> For full details, see the changelog:
> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.2/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1160/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_2/
>
> The proposed 9.0.2 release is:
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 9.0.2
> [X] Beta   - go ahead and release as 9.0.2
> [ ] Stable - go ahead and release as 9.0.2
>

I think important features got stressed tested and fixed this time (push,
in particular), so it might be good enough for stable.

Rémy

svn commit: r1816420 - in /tomcat/trunk/java: javax/websocket/WebSocketContainer.java org/apache/tomcat/websocket/WsWebSocketContainer.java

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 10:34:22 2017
New Revision: 1816420

URL: http://svn.apache.org/viewvc?rev=1816420&view=rev
Log:
Remove deprecated code.

Modified:
tomcat/trunk/java/javax/websocket/WebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: tomcat/trunk/java/javax/websocket/WebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/WebSocketContainer.java?rev=1816420&r1=1816419&r2=1816420&view=diff
==
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Mon Nov 27 
10:34:22 2017
@@ -33,17 +33,6 @@ public interface WebSocketContainer {
  * Set the default timeout for sending a message asynchronously.
  * @param timeout The new default timeout in milliseconds. A non-positive
  *value means an infinite timeout.
- *
- * @deprecated This will be removed in Tomcat 9.
- * Use {@link #setDefaultAsyncSendTimeout(long)}
- */
-@Deprecated
-void setAsyncSendTimeout(long timeout);
-
-/**
- * Set the default timeout for sending a message asynchronously.
- * @param timeout The new default timeout in milliseconds. A non-positive
- *value means an infinite timeout.
  */
 void setDefaultAsyncSendTimeout(long timeout);
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1816420&r1=1816419&r2=1816420&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon 
Nov 27 10:34:22 2017
@@ -986,18 +986,6 @@ public class WsWebSocketContainer implem
  * The default value for this implementation is -1.
  */
 @Override
-@Deprecated
-public void setAsyncSendTimeout(long timeout) {
-this.defaultAsyncTimeout = timeout;
-}
-
-
-/**
- * {@inheritDoc}
- *
- * The default value for this implementation is -1.
- */
-@Override
 public void setDefaultAsyncSendTimeout(long timeout) {
 this.defaultAsyncTimeout = timeout;
 }



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

svn commit: r1816418 - in /tomcat/trunk: java/javax/websocket/WebSocketContainer.java java/org/apache/tomcat/websocket/WsWebSocketContainer.java test/org/apache/tomcat/websocket/TestWsWebSocketContain

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 10:33:22 2017
New Revision: 1816418

URL: http://svn.apache.org/viewvc?rev=1816418&view=rev
Log:
Getter and setter should use symmetric names

Modified:
tomcat/trunk/java/javax/websocket/WebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java

Modified: tomcat/trunk/java/javax/websocket/WebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/WebSocketContainer.java?rev=1816418&r1=1816417&r2=1816418&view=diff
==
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Mon Nov 27 
10:33:22 2017
@@ -33,9 +33,20 @@ public interface WebSocketContainer {
  * Set the default timeout for sending a message asynchronously.
  * @param timeout The new default timeout in milliseconds. A non-positive
  *value means an infinite timeout.
+ *
+ * @deprecated This will be removed in Tomcat 9.
+ * Use {@link #setDefaultAsyncSendTimeout(long)}
  */
+@Deprecated
 void setAsyncSendTimeout(long timeout);
 
+/**
+ * Set the default timeout for sending a message asynchronously.
+ * @param timeout The new default timeout in milliseconds. A non-positive
+ *value means an infinite timeout.
+ */
+void setDefaultAsyncSendTimeout(long timeout);
+
 Session connectToServer(Object endpoint, URI path)
 throws DeploymentException, IOException;
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1816418&r1=1816417&r2=1816418&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon 
Nov 27 10:33:22 2017
@@ -986,10 +986,22 @@ public class WsWebSocketContainer implem
  * The default value for this implementation is -1.
  */
 @Override
+@Deprecated
 public void setAsyncSendTimeout(long timeout) {
 this.defaultAsyncTimeout = timeout;
 }
 
+
+/**
+ * {@inheritDoc}
+ *
+ * The default value for this implementation is -1.
+ */
+@Override
+public void setDefaultAsyncSendTimeout(long timeout) {
+this.defaultAsyncTimeout = timeout;
+}
+
 
 /**
  * Cleans up the resources still in use by WebSocket sessions created from

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1816418&r1=1816417&r2=1816418&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java 
Mon Nov 27 10:33:22 2017
@@ -325,7 +325,7 @@ public class TestWsWebSocketContainer ex
 
 // Set the async timeout
 if (setTimeoutOnContainer) {
-wsContainer.setAsyncSendTimeout(TIMEOUT_MS);
+wsContainer.setDefaultAsyncSendTimeout(TIMEOUT_MS);
 }
 
 tomcat.start();
@@ -606,7 +606,7 @@ public class TestWsWebSocketContainer ex
 sc.addEndpoint(ServerEndpointConfig.Builder.create(
 ConstantTxEndpoint.class, PATH).build());
 if (TestWsWebSocketContainer.timeoutOnContainer) {
-sc.setAsyncSendTimeout(TIMEOUT_MS);
+sc.setDefaultAsyncSendTimeout(TIMEOUT_MS);
 }
 } catch (DeploymentException e) {
 throw new IllegalStateException(e);



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

svn commit: r1816419 - in /tomcat/tc8.5.x/trunk: ./ java/javax/websocket/WebSocketContainer.java java/org/apache/tomcat/websocket/WsWebSocketContainer.java test/org/apache/tomcat/websocket/TestWsWebSo

2017-11-27 Thread markt 
Author: markt
Date: Mon Nov 27 10:33:48 2017
New Revision: 1816419

URL: http://svn.apache.org/viewvc?rev=1816419&view=rev
Log:
Getter and setter should use symmetric names

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/javax/websocket/WebSocketContainer.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 27 10:33:48 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176

Re: [VOTE] Release Apache Tomcat 9.0.2

2017-11-27 Thread Mark Thomas 
On 25/11/17 21:36, Mark Thomas wrote:
> The proposed Apache Tomcat 9.0.2 release is now available for voting.
> 
> The major changes compared to the 9.0.1 release are:
> 
> - Java 9 is fully supported
> 
> - Fixed numerous JASPIC issues with patches from Lazar
> 
> - Update the packaged version of the Tomcat Native Library to
>   1.2.16 to pick up the latest Windows binaries built with
>   APR 1.6.3 and OpenSSL 1.0.2m
> 
> Along with lots of other bug fixes and improvements.
> 
> 
> For full details, see the changelog:
> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.2/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1160/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_2/
> 
> The proposed 9.0.2 release is:
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 9.0.2
> [X] Beta   - go ahead and release as 9.0.2
> [ ] Stable - go ahead and release as 9.0.2

Unit tests pass for NIO, NIO2 and APR/native with Tomcat Native 1.2.16
on Windows, OSX and Linux.

I think we are fairly close to a stable release but I'd like to see what
issues emerge over at least one more release cycle before voting stable.

Mark

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

Re: Contributing to to Tomcat(Beginners issues)

2017-11-27 Thread Mark Thomas 
On 26/11/17 19:29, Mohamed Abd ALLAH wrote:
> Hello,
> 
> So driven by the motivation to  understand Tomcat inside out and to pay
> back to the community. I would like to dedicate a few hours on weekly basis
> to contribute to Tomcat development.
> 
> I already read the contribution guide and checked the beginners bugs
> 
> to
> start with something relatively easy to debug and test,  but apparently all
> of them are already taken by other contributors.
> 
> So as suggested by in the contribution document, i am asking here on the
> list.Thanks a lot and looking forward!

Welcome to the Tomcat community.

One of the unfortunate side-effects of keeping the current open bug
count low is that there is relatively little low hanging fruit. There
are a couple of general areas where beginners can help out.

The first is improving code coverage of the tests. The current coverage
can be found here:
https://ci.apache.org/projects/tomcat/tomcat9/coverage/

Additional tests that improve the coverage would be great. (DBCP2
doesn't need to be tested.)

The other area is FindBugs / SpotBugs. If you run FindBugs on the
command line there are quite a few low level issues remaining. Fixes for
those (which might include marking things as false positives) would also
be welcome.

Finally, keep you eye on the changes to bug reports in case the beginner
label is added to any more issues.

When proposing your first patch keep it simple. Start small and then
build up to larger patches.

Any questions, just ask.

Mark


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

Re: [VOTE] Release Apache Tomcat 9.0.2

2017-11-27 Thread Romain Manni-Bucau 
2017-11-27 9:15 GMT+01:00 Konstantin Kolinko :
> 2017-11-27 10:55 GMT+03:00 Romain Manni-Bucau :
>> Hi guys,
>>
>> I have 2 questions:
>>
>> 1. (simple ;)) is the repo released? central is not yet synch-ed
>
> It is a VOTE thread, not a RELEASE one.
>
> Nothing should be on Central.

oops, not sure why I read announce yesterday, forget it

>
>> 2. "java 9 fully supported": I didn't see the classloader update to
>> support multi-jar release
>
> Yes. Issue 61601.
>
>> or module-info respect (visibility+SPI),
>
> I do not understand what you mean here.
>
> There are no such feature requests in Bugzilla, nor in changelog,
> meaning nobody needs this feature.

Well this is a bit fast as answer ;) since java 9 brings new features
then fully supported would naturally mean Tomcat embraces these
features as well otherwise you can code a "standard" java 9 app and
have it not working in Tomcat. There is no issue
not supporting it yet - even Spring doesn't - but the "fully" made me
wondering if I missed a key commit.

Thanks for the clarification.

>
>> is it intended or is it "support" as "can run" only?
>>
>> Romain Manni-Bucau
>> @rmannibucau |  Blog | Old Blog | Github | LinkedIn
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

Re: [VOTE] Release Apache Tomcat 9.0.2

2017-11-27 Thread Konstantin Kolinko 
2017-11-27 10:55 GMT+03:00 Romain Manni-Bucau :
> Hi guys,
>
> I have 2 questions:
>
> 1. (simple ;)) is the repo released? central is not yet synch-ed

It is a VOTE thread, not a RELEASE one.

Nothing should be on Central.

> 2. "java 9 fully supported": I didn't see the classloader update to
> support multi-jar release

Yes. Issue 61601.

> or module-info respect (visibility+SPI),

I do not understand what you mean here.

There are no such feature requests in Bugzilla, nor in changelog,
meaning nobody needs this feature.

> is it intended or is it "support" as "can run" only?
>
> Romain Manni-Bucau
> @rmannibucau |  Blog | Old Blog | Github | LinkedIn

Best regards,
Konstantin Kolinko

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