[jboss-cvs] JBoss Messaging SVN: r2036 - in branches/Branch_1_0/src/main/org/jboss: messaging/core/plugin and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 24 13:25:52 EST 2007
Author: juha at jboss.org
Date: 2007-01-24 13:25:52 -0500 (Wed, 24 Jan 2007)
New Revision: 2036
Modified:
branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
branches/Branch_1_0/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-637
Modified: branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java 2007-01-24 18:25:23 UTC (rev 2035)
+++ branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java 2007-01-24 18:25:52 UTC (rev 2036)
@@ -1274,6 +1274,18 @@
{
log.debug("Error populating tables: " + nextQry, ignored);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
}
}
Modified: branches/Branch_1_0/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2007-01-24 18:25:23 UTC (rev 2035)
+++ branches/Branch_1_0/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2007-01-24 18:25:52 UTC (rev 2036)
@@ -2345,11 +2345,14 @@
try
{
conn = ds.getConnection();
-
+ Statement st = null;
+
try
{
- conn.createStatement().executeUpdate(createTransaction);
- if (trace)
+ st = conn.createStatement();
+ st.executeUpdate(createTransaction);
+
+ if (trace)
{
log.trace(createTransaction + " succeeded");
}
@@ -2358,10 +2361,24 @@
{
log.debug(createTransaction + " failed!", e);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
try
{
- conn.createStatement().executeUpdate(createMessageReference);
+ st = conn.createStatement();
+ st.executeUpdate(createMessageReference);
+
if (trace)
{
log.trace(createMessageReference + " succeeded");
@@ -2371,10 +2388,24 @@
{
log.debug(createMessageReference + " failed!", e);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
try
{
- conn.createStatement().executeUpdate(createIdxMessageRefTx);
+ st = conn.createStatement();
+ st.executeUpdate(createIdxMessageRefTx);
+
if (trace)
{
log.trace(createIdxMessageRefTx + " succeeded");
@@ -2384,10 +2415,24 @@
{
log.debug(createIdxMessageRefTx + " failed!", e);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
try
{
- conn.createStatement().executeUpdate(createIdxMessageRefOrd);
+ st = conn.createStatement();
+ st.executeUpdate(createIdxMessageRefOrd);
+
if (trace)
{
log.trace(createIdxMessageRefOrd + " succeeded");
@@ -2397,10 +2442,24 @@
{
log.debug(createIdxMessageRefOrd + " failed!", e);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
try
{
- conn.createStatement().executeUpdate(createIdxMessageRefMessageId);
+ st = conn.createStatement();
+ st.executeUpdate(createIdxMessageRefMessageId);
+
if (trace)
{
log.trace(createIdxMessageRefMessageId + " succeeded");
@@ -2410,10 +2469,24 @@
{
log.debug(createIdxMessageRefOrd + " failed!", e);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
try
{
- conn.createStatement().executeUpdate(createIdxMessageRefLoaded);
+ st = conn.createStatement();
+ st.executeUpdate(createIdxMessageRefLoaded);
+
if (trace)
{
log.trace(createIdxMessageRefLoaded + " succeeded");
@@ -2423,10 +2496,24 @@
{
log.debug(createIdxMessageRefLoaded + " failed!", e);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
try
{
- conn.createStatement().executeUpdate(createIdxMessageRefReliable);
+ st = conn.createStatement();
+ st.executeUpdate(createIdxMessageRefReliable);
+
if (trace)
{
log.trace(createIdxMessageRefReliable + " succeeded");
@@ -2436,10 +2523,24 @@
{
log.debug(createIdxMessageRefReliable + " failed!", e);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
try
{
- conn.createStatement().executeUpdate(createMessage);
+ st = conn.createStatement();
+ st.executeUpdate(createMessage);
+
if (trace)
{
log.trace(createMessage + " succeeded");
@@ -2449,10 +2550,24 @@
{
log.debug(createMessage + " failed!", e);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
try
{
- conn.createStatement().executeUpdate(createCounter);
+ st = conn.createStatement();
+ st.executeUpdate(createCounter);
+
if (trace)
{
log.trace(createCounter + " succeeded");
@@ -2462,6 +2577,18 @@
{
log.debug(createCounter + " failed!", e);
}
+ finally
+ {
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (Throwable ignored)
+ {}
+ }
+ }
}
finally
{
More information about the jboss-cvs-commits
mailing list