[jboss-cvs] JBoss Messaging SVN: r2725 - in trunk: tests/src/org/jboss/test/messaging/jms/bridge and 1 other directory.

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

Author: timfox
Date: 2007-05-24 14:58:03 -0400 (Thu, 24 May 2007)
New Revision: 2725

Modified:
   trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
   trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
   trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-916


Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java	2007-05-24 15:21:04 UTC (rev 2724)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java	2007-05-24 18:58:03 UTC (rev 2725)
@@ -1429,6 +1429,9 @@
          {
             maxOrdering = null;
          }
+         
+         ps.close();
+         
          conn.close();
          
          conn = ds.getConnection();         

Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java	2007-05-24 15:21:04 UTC (rev 2724)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java	2007-05-24 18:58:03 UTC (rev 2725)
@@ -23,6 +23,7 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -210,6 +211,8 @@
       for(Iterator i = defaultDDLStatements.keySet().iterator(); i.hasNext(); )
       {
          Connection conn = null;      
+         
+         Statement st = null;
                   
          TransactionWrapper tx = new TransactionWrapper();
                   
@@ -227,7 +230,9 @@
                {
                   if (log.isTraceEnabled()) { log.trace("Executing: " + statement); }
                       
-                  conn.createStatement().executeUpdate(statement);
+                  st = conn.createStatement();
+                  
+                  st.executeUpdate(statement);
                }
                catch (SQLException e) 
                {
@@ -239,6 +244,15 @@
          }
          finally
          {
+         	if (st != null)
+            {
+               try
+               {
+                  st.close();
+               }
+               catch (Throwable t)
+               {}
+            }
             if (conn != null)
             {
                try

Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java	2007-05-24 15:21:04 UTC (rev 2724)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java	2007-05-24 18:58:03 UTC (rev 2725)
@@ -315,8 +315,6 @@
       
       log.trace("checkMessagesReceived");
       
-      log.info("***** CHECKING I GOT THE MESSAGES");
-
       try
       {
          conn = cf.createConnection();
@@ -336,9 +334,7 @@
          while (true)
          {
             TextMessage tm = (TextMessage)cons.receive(5000);
-            
-            log.info("GOT MESSAGE: "+tm);
-            
+              
             if (tm == null)
             {
                break;