activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1345023 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
Date Fri, 01 Jun 2012 09:14:28 GMT
Author: dejanb
Date: Fri Jun  1 09:14:28 2012
New Revision: 1345023

URL: http://svn.apache.org/viewvc?rev=1345023&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-2868 - remove sync on memoery transaction store
tx

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java?rev=1345023&r1=1345022&r2=1345023&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
Fri Jun  1 09:14:28 2012
@@ -16,12 +16,6 @@
  */
 package org.apache.activemq.store.memory;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Future;
-
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
@@ -37,6 +31,12 @@ import org.apache.activemq.store.TopicMe
 import org.apache.activemq.store.TransactionRecoveryListener;
 import org.apache.activemq.store.TransactionStore;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
+
 /**
  * Provides a TransactionStore implementation that can create transaction aware
  * MessageStore objects from non transaction aware MessageStore objects.
@@ -243,12 +243,9 @@ public class MemoryTransactionStore impl
             }
             return;
         }
-        // ensure message order w.r.t to cursor and store for setBatch()
-        synchronized (this) {
-            tx.commit();
-            if (postCommit != null) {
-                postCommit.run();
-            }
+        tx.commit();
+        if (postCommit != null) {
+            postCommit.run();
         }
     }
 



Mime
View raw message