[jboss-svn-commits] JBL Code SVN: r28422 - labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc.

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

Author: mark.little at jboss.com
Date: 2009-07-25 09:03:14 -0400 (Sat, 25 Jul 2009)
New Revision: 28422

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java
Log:
https://jira.jboss.org/jira/browse/JBTM-532

Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java	2009-07-25 12:09:07 UTC (rev 28421)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java	2009-07-25 13:03:14 UTC (rev 28422)
@@ -306,9 +306,8 @@
 	 * @message com.arjuna.ats.internal.jdbc.closingconnection Connection will be closed now.
 	 *          Indications are that this db does not allow multiple
 	 *          connections in the same transaction {0}
-	 * @message com.arjuna.ats.internal.jdbc.closingconnectionnull Connection will be closed when
-         *          transaction terminates. No modifier information found for db so this may
-         *          cause problems for other users! {0}
+	 * @message com.arjuna.ats.internal.jdbc.closingconnectionnull No modifier information found for db.
+	 *         Connection will be closed immediately {0}
          * @message com.arjuna.ats.internal.jdbc.closeerrorinvalidtx Invalid transaction during close {0}
 	 */
 
@@ -358,16 +357,23 @@
 
 	                if (_theModifier == null)
 	                {
-	                    if (jdbcLogger.loggerI18N.isWarnEnabled())
+	                    if (jdbcLogger.loggerI18N.isInfoEnabled())
                             {
                                     jdbcLogger.loggerI18N
-                                                    .warn(
+                                                    .info(
                                                                     "com.arjuna.ats.internal.jdbc.closingconnectionnull",
                                                                     new Object[]
                                                                     { _theConnection });
                             }
+
+	                    // no indication about connections, so assume close immediately
 	                    
-	                    // no indication about connections, so assume close immediately
+	                    if (_theConnection != null && !_theConnection.isClosed())
+	                        _theConnection.close();
+
+	                    _theConnection = null;
+	                    
+	                    return;
 	                }
 	                else
 	                {
@@ -430,7 +436,7 @@
 	        throw sqlException;
 	    }
 	}
-
+	
 	public boolean isClosed() throws SQLException
 	{
 		/*