You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/09/22 07:20:04 UTC
svn commit: r1809265 - in /tomcat/trunk:
modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
webapps/docs/changelog.xml
Author: markt
Date: Fri Sep 22 07:20:04 2017
New Revision: 1809265
URL: http://svn.apache.org/viewvc?rev=1809265&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61545
Correctly handle invocations of methods defined in the PooledConnection interface when using pooled XA connections.
Patch provided by Nils Winkler.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=1809265&r1=1809264&r2=1809265&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java Fri Sep 22 07:20:04 2017
@@ -103,7 +103,7 @@ public class ProxyConnection extends Jdb
return this.toString();
} else if (compare(GETCONNECTION_VAL,method) && connection!=null) {
return connection.getConnection();
- } else if (method.getDeclaringClass().equals(XAConnection.class)) {
+ } else if (method.getDeclaringClass().isAssignableFrom(XAConnection.class)) {
try {
return method.invoke(connection.getXAConnection(),args);
}catch (Throwable t) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1809265&r1=1809264&r2=1809265&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Sep 22 07:20:04 2017
@@ -97,6 +97,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="jdbc-pool">
+ <changelog>
+ <fix>
+ <bug>61545</bug>: Correctly handle invocations of methods defined in the
+ <code>PooledConnection</code> interface when using pooled XA
+ connections. Patch provided by Nils Winkler. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org