Author: markt
Date: Wed Sep 8 15:27:00 2010
New Revision: 995091
URL: http://svn.apache.org/viewvc?rev=995091&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49831
Make sure pooled XA connections are properly closed when the pool shuts down.
Based on a patch by Daniel Mikusa.
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=995091&r1=995090&r2=995091&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Wed Sep 8 15:27:00 2010
@@ -265,7 +265,11 @@ public class PooledConnection {
if (connection != null) {
try {
parent.disconnectEvent(this, finalize);
- connection.close();
+ if (xaConnection == null) {
+ connection.close();
+ } else {
+ xaConnection.close();
+ }
}catch (Exception ignore) {
if (log.isDebugEnabled()) {
log.debug("Unable to close underlying SQL
connection",ignore);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
