diff --git a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/InboundMessageProcessor.java b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/InboundMessageProcessor.java
index f4098799f..52a6d40cc 100644
--- a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/InboundMessageProcessor.java
+++ b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/InboundMessageProcessor.java
@@ -431,6 +431,7 @@ public class InboundMessageProcessor implements Runnable, MessageExchangeReplyLi
                 if (connection != null) {
                     if (epb.isClustered()) {
                         connection.commit();
+                        connection.setAutoCommit(true);
                     }
                     connection.close();
                 }
diff --git a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/OutboundMessageProcessor.java b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/OutboundMessageProcessor.java
index 9c79c6af5..9ba8abe2b 100644
--- a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/OutboundMessageProcessor.java
+++ b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/OutboundMessageProcessor.java
@@ -1015,8 +1015,6 @@ public class OutboundMessageProcessor implements Runnable {
             if (transaction != null)
               resumeThreadTx(transaction);
 
-            connection.setAutoCommit(true);
-
             /* PP: Glassfish does not return a XADataSource and always returns
              * a DataSource30 object which does not implement getXAResource() method
             xaconnection = getXADatabaseConnection(epb);
@@ -1292,7 +1290,6 @@ public class OutboundMessageProcessor implements Runnable {
                         MessageExchange.JTA_TRANSACTION_PROPERTY_NAME);
               if (transaction != null)
                 resumeThreadTx(transaction);
-              connection.setAutoCommit(true);
               cs = executeOutboundProc(inMsg, epb, meta, jndiName, connection);
               final JDBCNormalizer normalizer =
                       new JDBCNormalizer();
@@ -1534,8 +1531,6 @@ public class OutboundMessageProcessor implements Runnable {
         String jndiName = (String)jndiConn[0];
         connection = (Connection)jndiConn[1];
 
-        if (transaction != null)
-          connection.setAutoCommit(true);
         // writeMessage(inMsg, destinationAddress, false);
         if (meta.getJDBCOperationInput().getOperationType().
                 equalsIgnoreCase(
@@ -1927,6 +1922,7 @@ public class OutboundMessageProcessor implements Runnable {
               "DBBC_E00627");
       throw e;
     }
+    connection.setAutoCommit(true);
     return new Object[] { jndiName, connection };
   }