You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2023/04/04 02:45:54 UTC
[james-project] 06/09: [UPGRADE] Mime4J 0.8.9: dispose messages
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 efa99fb41110f0c9f631a889a102248d650acd00
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Jan 12 10:36:37 2023 +0700
[UPGRADE] Mime4J 0.8.9: dispose messages
---
.../src/main/java/org/apache/james/vault/DeletedMessageConverter.java | 4 +++-
.../src/main/java/org/apache/james/mailbox/store/MessageStorer.java | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageConverter.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageConverter.java
index d12c61c10a..655cd9b54c 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageConverter.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageConverter.java
@@ -52,7 +52,7 @@ class DeletedMessageConverter {
Optional<Message> mimeMessage = parseMessage(message);
- return DeletedMessage.builder()
+ DeletedMessage deletedMessage = DeletedMessage.builder()
.messageId(deletedMessageMailboxContext.getMessageId())
.originMailboxes(deletedMessageMailboxContext.getOwnerMailboxes())
.user(retrieveOwner(deletedMessageMailboxContext))
@@ -64,6 +64,8 @@ class DeletedMessageConverter {
.size(message.getFullContentOctets())
.subject(mimeMessage.map(Message::getSubject))
.build();
+ mimeMessage.ifPresent(Message::dispose);
+ return deletedMessage;
}
private Optional<Message> parseMessage(org.apache.james.mailbox.store.mail.model.Message message) throws IOException {
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageStorer.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageStorer.java
index bebe032181..7b63a6b5bc 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageStorer.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageStorer.java
@@ -35,7 +35,6 @@ import org.apache.james.mailbox.model.Mailbox;
import org.apache.james.mailbox.model.MessageAttachmentMetadata;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.MessageMetaData;
-import org.apache.james.mailbox.model.ParsedAttachment;
import org.apache.james.mailbox.model.ThreadId;
import org.apache.james.mailbox.store.mail.AttachmentMapperFactory;
import org.apache.james.mailbox.store.mail.MessageMapper;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org