[jboss-cvs] JBossAS SVN: r65150 - branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2007-09-06 07:42:22 -0400 (Thu, 06 Sep 2007)
New Revision: 65150

Modified:
   branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java
Log:
[JBAS-4667] - Patch by Oleg Nitz for spurious connection not closed warnings

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java	2007-09-06 11:05:20 UTC (rev 65149)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java	2007-09-06 11:42:22 UTC (rev 65150)
@@ -544,13 +544,13 @@
       try
       {
          Transaction tx = tm.getTransaction();
-         if (TxUtils.isActive(tx))
+         if (tx != null)
          {
             TransactionSynchronizer.lock(tx);
             try
             {
                CloseConnectionSynchronization cas = (CloseConnectionSynchronization) TransactionSynchronizer.getCCMSynchronization(tx);
-               if (cas == null && createIfNotFound)
+               if (cas == null && createIfNotFound && TxUtils.isActive(tx))
                {
                   cas = new CloseConnectionSynchronization();
                   TransactionSynchronizer.registerCCMSynchronization(tx, cas);