This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit d4930890e1d83e8cbc014f9dd71fa39d746feea3 Author: Benoit Tellier <[email protected]> AuthorDate: Mon Nov 2 13:50:30 2020 +0100 MAILBOX-339 Propagate errors on single items upon migration This prevents harmful version switches --- .../james/mailbox/cassandra/mail/migration/MailboxPathV2Migration.java | 2 +- .../james/mailbox/cassandra/mail/migration/MailboxPathV3Migration.java | 2 +- .../james/mailbox/cassandra/mail/migration/MessageV3Migration.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2Migration.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2Migration.java index 28024cc..46c3fc2 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2Migration.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2Migration.java @@ -117,7 +117,7 @@ public class MailboxPathV2Migration implements Migration { private Mono<Void> handleErrorMigrate(CassandraIdAndPath idAndPath, Throwable throwable) { LOGGER.error("Error while performing migration for path {}", idAndPath.getMailboxPath(), throwable); - return Mono.empty(); + return Mono.error(throwable); } @Override diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV3Migration.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV3Migration.java index 910c61f..ccd727c 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV3Migration.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV3Migration.java @@ -121,7 +121,7 @@ public class MailboxPathV3Migration implements Migration { private Mono<Void> handleErrorMigrate(CassandraIdAndPath idAndPath, Throwable throwable) { LOGGER.error("Error while performing migration for path {}", idAndPath.getMailboxPath(), throwable); - return Mono.empty(); + return Mono.error(throwable); } @Override diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MessageV3Migration.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MessageV3Migration.java index 2c37c4c..72cbd85 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MessageV3Migration.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MessageV3Migration.java @@ -105,7 +105,7 @@ public class MessageV3Migration implements Migration { private Mono<Void> handleErrorMigrate(MessageRepresentation messageRepresentation, Throwable throwable) { LOGGER.error("Error while performing migration for {}", messageRepresentation.getMessageId(), throwable); - return Mono.empty(); + return Mono.error(throwable); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
