This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c674ec9442b563b51c2cb4958301f2adf98423de 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 --- .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 6 ++++-- webapps/docs/changelog.xml | 8 ++++++++ 2 files changed, 12 insertions(+), 2 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 6cc23a7e7b..2d02f24884 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 @@ -371,8 +371,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 2a9391996e..137d887fde 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,14 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 11.0.0-M13 (markt)" 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 11.0.0-M12 that broke the jdbc-pool. (markt) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 11.0.0-M12 (markt)" rtext="2023-10-10"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org