diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
index 3f7fcfbd9d..7f39fafeaa 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -679,7 +679,7 @@ public class Queue extends BaseDestination implements Task, UsageListener {
             
                 context.getTransaction().addSynchronization(new Synchronization() {
                     @Override
-                    public void beforeCommit() throws Exception {
+                    public void afterCommit() throws Exception {
                         sendLock.lockInterruptibly();
                         try {
                             // It could take while before we receive the commit
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
index 26c7579f24..2df34bc65f 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
@@ -452,7 +452,7 @@ public class Topic extends BaseDestination implements Task {
         if (context.isInTransaction()) {
             context.getTransaction().addSynchronization(new Synchronization() {
                 @Override
-                public void beforeCommit() throws Exception {
+                public void afterCommit() throws Exception {
                     // It could take while before we receive the commit
                     // operration.. by that time the message could have
                     // expired..
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
index ab70a5ed9c..fb7a94952d 100644
--- a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
@@ -460,21 +460,6 @@ public class KahaDBPersistenceAdapter implements PersistenceAdapter, BrokerServi
         letter.setConcurrentStoreAndDispatchTopics(concurrentStoreAndDispatch);
     }
 
-    /**
-     * @return the concurrentStoreAndDispatchTransactions
-     */
-    public boolean isConcurrentStoreAndDispatchTransactions() {
-        return letter.isConcurrentStoreAndDispatchTransactions();
-    }
-
-    /**
-     * @param concurrentStoreAndDispatchTransactions
-     *            the concurrentStoreAndDispatchTransactions to set
-     */
-    public void setConcurrentStoreAndDispatchTransactions(boolean concurrentStoreAndDispatchTransactions) {
-        letter.setConcurrentStoreAndDispatchTransactions(concurrentStoreAndDispatchTransactions);
-    }
-
     public int getMaxAsyncJobs() {
         return letter.getMaxAsyncJobs();
     }
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
index 4f976c289a..3c6b57e909 100644
--- a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
@@ -106,7 +106,7 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter {
     Semaphore globalTopicSemaphore;
     private boolean concurrentStoreAndDispatchQueues = true;
     private boolean concurrentStoreAndDispatchTopics = true;
-    private boolean concurrentStoreAndDispatchTransactions = true;
+    private boolean concurrentStoreAndDispatchTransactions = false;
     private int maxAsyncJobs = MAX_ASYNC_JOBS;
     private final KahaDBTransactionStore transactionStore;
 
@@ -155,21 +155,10 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter {
         this.concurrentStoreAndDispatchTopics = concurrentStoreAndDispatch;
     }
 
-    /**
-     * @return the concurrentStoreAndDispatchTransactions
-     */
     public boolean isConcurrentStoreAndDispatchTransactions() {
         return this.concurrentStoreAndDispatchTransactions;
     }
-
-    /**
-     * @param concurrentStoreAndDispatchTransactions
-     *            the concurrentStoreAndDispatchTransactions to set
-     */
-    public void setConcurrentStoreAndDispatchTransactions(boolean concurrentStoreAndDispatchTransactions) {
-        this.concurrentStoreAndDispatchTransactions = concurrentStoreAndDispatchTransactions;
-    }
-
+    
     /**
      * @return the maxAsyncJobs
      */
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java
index 9396f5ed4d..683a18bb22 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java
@@ -217,7 +217,6 @@ public class KahaDBTransactionStore implements TransactionStore {
     }
 
     /**
-     * @throws XAException
      * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction)
      */
     public void commit(TransactionId txid, boolean wasPrepared, Runnable preCommit, Runnable postCommit)
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java
index 9494b31ad1..2a8bfc2456 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java
@@ -42,7 +42,6 @@ public class TransactedTopicMasterSlaveTest extends JmsTopicTransactionTest {
         File dir = new File ("target" + File.separator + "slave");
         KahaDBPersistenceAdapter adapter = new KahaDBPersistenceAdapter();
         adapter.setDirectory(dir);
-        adapter.setConcurrentStoreAndDispatchTransactions(false);
         broker.start();
         slave = new BrokerService();
         slave.setBrokerName("slave");
@@ -73,7 +72,6 @@ public class TransactedTopicMasterSlaveTest extends JmsTopicTransactionTest {
         File dir = new File ("target" + File.separator + "master");
         KahaDBPersistenceAdapter adapter = new KahaDBPersistenceAdapter();
         adapter.setDirectory(dir);
-        adapter.setConcurrentStoreAndDispatchTransactions(false);
         BrokerService broker = new BrokerService();
         broker.setBrokerName("master");
         broker.setPersistenceAdapter(adapter);