This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 89b7f18bcc Correct regression caused by clean-up of unnecessary FQCN. 89b7f18bcc is described below commit 89b7f18bccfd6b93edaab98483f474cfc1dda47d Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Oct 10 11:13:11 2023 -0300 Correct regression caused by clean-up of unnecessary FQCN. This usage is necessary to avoid confusion between javax.sql.PooledConnection and org.apache.tomcat.jdbc.pool.PooledConnection --- .../main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 6 ++++-- webapps/docs/changelog.xml | 9 ++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java index 8b59d84d1a..1a99f4e698 100644 --- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java +++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java @@ -366,8 +366,10 @@ public class ConnectionPool { //cache the constructor if (proxyClassConstructor == null ) { Class<?> proxyClass = xa ? - Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), new Class[] {Connection.class, PooledConnection.class, XAConnection.class}) : - Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), new Class[] {Connection.class, PooledConnection.class}); + Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), + new Class[] {Connection.class, javax.sql.PooledConnection.class, XAConnection.class}) : + Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), + new Class[] {Connection.class, javax.sql.PooledConnection.class}); proxyClassConstructor = proxyClass.getConstructor(new Class[] { InvocationHandler.class }); } return proxyClassConstructor; diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b0a7b6eff7..d6e194a05e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,8 +105,15 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 8.5.95 (schultz)" rtext="in development"> + <subsection name="jdbc-pool"> + <changelog> + <fix> + Correct a regression in the clean-up of unencessary use of fully + qualified class names in 8.5.94 that broke the jdbc-pool. (markt) + </fix> + </changelog> + </subsection> </section> - <section name="Tomcat 8.5.94 (schultz)" rtext="2023-10-10"> <subsection name="Catalina"> <changelog> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org