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


The following commit(s) were added to refs/heads/master by this push:
     new 5011c399c9 [FIX] Preserve internal date on restored messages (#2574)
5011c399c9 is described below

commit 5011c399c9d1513c6108656cdacaced288aa2668
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Fri Dec 20 14:53:09 2024 +0100

    [FIX] Preserve internal date on restored messages (#2574)
---
 .../java/org/apache/james/webadmin/vault/routes/RestoreService.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
 
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
index 0c5e4eda18..9086a4f7af 100644
--- 
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
+++ 
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
@@ -25,6 +25,7 @@ import static 
org.apache.james.webadmin.vault.routes.RestoreService.RestoreResul
 import static 
org.apache.james.webadmin.vault.routes.RestoreService.RestoreResult.RESTORE_SUCCEED;
 
 import java.io.InputStream;
+import java.util.Date;
 import java.util.function.Predicate;
 
 import jakarta.inject.Inject;
@@ -88,7 +89,9 @@ public class RestoreService {
             messageContent(deletedMessage),
             inputStream -> Mono.usingWhen(
                 Mono.fromCallable(() -> ByteSourceContent.of(inputStream)),
-                content -> 
Mono.from(restoreMailboxManager.appendMessageReactive(AppendCommand.builder().build(content),
 session))
+                content -> 
Mono.from(restoreMailboxManager.appendMessageReactive(AppendCommand.builder()
+                        
.withInternalDate(Date.from(deletedMessage.getDeliveryDate().toInstant()))
+                        .build(content), session))
                     .map(any -> RESTORE_SUCCEED),
                 content -> 
Mono.fromRunnable(Throwing.runnable(content::close))),
             stream -> Mono.fromRunnable(Throwing.runnable(stream::close)))


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org

Reply via email to