james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject [2/3] james-project git commit: JAMES-2641 Solve concurency issues in event firing test
Date Fri, 01 Feb 2019 08:33:40 GMT
JAMES-2641 Solve concurency issues in event firing test

Tests proved to be unstable. After investigation this is a Reactor related bug.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b89275bc
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b89275bc
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b89275bc

Branch: refs/heads/master
Commit: b89275bc1944bebfa005a831545d7d6c35922e7a
Parents: dbb9598
Author: Benoit Tellier <btellier@linagora.com>
Authored: Wed Jan 30 14:13:30 2019 +0700
Committer: Benoit Tellier <btellier@linagora.com>
Committed: Fri Feb 1 15:33:00 2019 +0700

----------------------------------------------------------------------
 .../org/apache/james/mailbox/store/StoreMessageManager.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/b89275bc/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index 921083a..ca098fb 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -743,7 +743,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
             .previousMailboxIds(getMailboxEntity().getMailboxId())
             .targetMailboxIds(to.getMailboxEntity().getMailboxId(), getMailboxEntity().getMailboxId())
             .build();
-        Flux.merge(
+        Flux.concat(
             eventBus.dispatch(EventFactory.added()
                     .randomEventId()
                     .mailboxSession(session)
@@ -757,7 +757,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
                     .messageId(messageIds.build())
                     .build(),
                 messageMoves.impactedMailboxIds().map(MailboxIdRegistrationKey::new).collect(Guavate.toImmutableSet())))
-            .then().block();
+            .blockLast();
 
         return copiedUids;
     }
@@ -777,7 +777,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
             .previousMailboxIds(getMailboxEntity().getMailboxId())
             .targetMailboxIds(to.getMailboxEntity().getMailboxId())
             .build();
-        Flux.merge(
+        Flux.concat(
             eventBus.dispatch(EventFactory.added()
                     .randomEventId()
                     .mailboxSession(session)
@@ -798,7 +798,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
                     .session(session)
                     .build(),
                 messageMoves.impactedMailboxIds().map(MailboxIdRegistrationKey::new).collect(Guavate.toImmutableSet())))
-            .then().block();
+            .blockLast();
 
         return moveUids;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message