From 4e61a61cdcf1b1f34e515c1c456c4efd36faa0cf Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 8 Sep 2010 15:27:00 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@995091 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tomcat/jdbc/pool/PooledConnection.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java index 14ac8ef65..69f79978d 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java @@ -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); -- 2.11.0