activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-1303 Fix interleave during replication sync
Date Wed, 26 Jul 2017 09:26:10 GMT
ARTEMIS-1303 Fix interleave during replication sync


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/69f82632
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/69f82632
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/69f82632

Branch: refs/heads/master
Commit: 69f82632675c9b4a1327cf70ce53440358b6dc3e
Parents: d776a69
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Wed Jul 12 12:29:48 2017 +0100
Committer: Andy Taylor <andy.tayls67@gmail.com>
Committed: Wed Jul 26 10:25:47 2017 +0100

----------------------------------------------------------------------
 .../activemq/artemis/core/replication/ReplicationEndpoint.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/69f82632/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
index fed4805..4d81613 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
@@ -337,7 +337,7 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
       this.channel = channel;
    }
 
-   private void finishSynchronization(String liveID) throws Exception {
+   private synchronized void finishSynchronization(String liveID) throws Exception {
       if (logger.isTraceEnabled()) {
          logger.trace("BACKUP-SYNC-START: finishSynchronization::" + liveID);
       }


Mime
View raw message