[jboss-svn-commits] JBL Code SVN: r19563 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP2/product/rosetta/src/org/jboss/soa/esb/helpers/persist.

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

Author: kevin.conner at jboss.com
Date: 2008-04-15 06:08:32 -0400 (Tue, 15 Apr 2008)
New Revision: 19563

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
Log:
Fix connection leak in transactions: JBESB-1668

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java	2008-04-15 09:59:25 UTC (rev 19562)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java	2008-04-15 10:08:32 UTC (rev 19563)
@@ -83,17 +83,21 @@
 	
 	public void release()
 	{
-		if ((null != m_conn) && (!transactional))
+		if (null != m_conn)
 		{
-			try
+			if (!transactional)
 			{
-				m_conn.rollback();
+				try
+				{
+					m_conn.rollback();
+				}
+				catch (Exception eRoll)
+				{
+				}
 			}
-			catch (Exception eRoll)
-			{
-			}
 
 			for (PreparedStatement PS : m_olPrepSt)
+			{
 				try
 				{
 					PS.close();
@@ -101,6 +105,7 @@
 				catch (Exception e)
 				{
 				}
+			}
 			try
 			{
 				m_conn.close();
@@ -235,15 +240,6 @@
 		throw eRet;
 	} // __________________________________
 
-
-    public Connection createConnection() throws SQLException {
-        if (m_oDS == null) {
-            throw new SQLException("DataSource is null!");
-        }
-
-        return m_oDS.getConnection();
-    }
-
 	private void connect() throws SQLException
 	{
 		if (m_conn != null)