[jboss-svn-commits] JBL Code SVN: r19022 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db.

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

Author: mark.little at jboss.com
Date: 2008-03-15 12:20:07 -0400 (Sat, 15 Mar 2008)
New Revision: 19022

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1579

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2008-03-15 16:00:44 UTC (rev 19021)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2008-03-15 16:20:07 UTC (rev 19022)
@@ -365,13 +365,23 @@
         boolean error=false;
 
         Connection con = null;
+        
         try
         {
             con = mgr.getConnection();
             con.setAutoCommit(false);
             con.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
-            
-            
+        }
+        catch (final SQLException e)
+        {
+            if (logger.isDebugEnabled()) {
+        	logger.debug("Deadlocks may occur under normal processing.");
+        	logger.debug(e.getMessage(), e);
+            }
+        } 
+           
+        try
+        {
             Message message=select(uuid, con);
             
             if (message!=null && delete(uuid, RedeliverStore.CLASSIFICATION_RDLVR, con)==1) {
@@ -411,12 +421,10 @@
                 }
             }
         }
-        catch (SQLException e)
+        catch (final SQLException e)
         {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Deadlocks may occur under normal processing");
-                logger.debug(e.getMessage(), e);
-            }
+            logger.warn("DBMessageStoreImpl caught exception "+e+". Will force transaction to rollback.");
+            
             error=true;
         } 
         finally