Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Correctly handle invocations of methods defined in the PooledConnection interface when using pooled XA connections.
Patch provided by Nils Winkler.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk@1809266 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
markt-asf committed Sep 22, 2017
1 parent 1ef77a3 commit a448da0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
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) {
Expand Down
9 changes: 9 additions & 0 deletions webapps/docs/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,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>
Expand Down

0 comments on commit a448da0

Please sign in to comment.