[activemq-artemis] branch master updated: NO-JIRA typo on logger

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[activemq-artemis] branch master updated: NO-JIRA typo on logger

jbertram
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 3e20906  NO-JIRA typo on logger
     new d8d35a1  This closes #2683
3e20906 is described below

commit 3e20906a49974b97e374e01b2099b5fad9cbd8ed
Author: yang wei <[hidden email]>
AuthorDate: Wed May 29 16:57:40 2019 +0800

    NO-JIRA typo on logger
---
 .../apache/activemq/artemis/core/replication/ReplicationManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
index 1d1217d..6554cc8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
@@ -612,7 +612,7 @@ public final class ReplicationManager implements ActiveMQComponent {
    private void flushReplicationStream(FlushAction action) throws Exception {
       action.reset();
       replicationStream.execute(action);
-      if (!action.await(this.timeout, TimeUnit.MILLISECONDS)) {
+      if (!action.await(this.initialReplicationSyncTimeout, TimeUnit.MILLISECONDS)) {
          throw ActiveMQMessageBundle.BUNDLE.replicationSynchronizationTimeout(initialReplicationSyncTimeout);
       }
    }