Skip to content

Commit 45668a4

Browse files
committed
Apply review feedback
1 parent 81ee4c2 commit 45668a4

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
* @author Dominik Simmen
6969
* @author Yuxin Wang
7070
* @author Ngoc Nhan
71+
* @author Filip Hrisafov
7172
*/
7273
public abstract class AbstractMailReceiver extends IntegrationObjectSupport implements MailReceiver, DisposableBean {
7374

@@ -503,6 +504,12 @@ private Object byteArrayToContent(Map<String, Object> headers, ByteArrayOutputSt
503504
}
504505

505506
private void postProcessFilteredMessages(Message[] filteredMessages) throws MessagingException {
507+
// It is more intuitive use a local variable Message[] messages = filteredMessages;
508+
// and then call setMessageFlagsAndMaybeDeleteMessages(messages); after the if, i.e. remove the else.
509+
// However, in setMessageFlagsAndMaybeDeleteMessages we are calling Message#setFlag and Message#setFlags
510+
// which have different implementations in different implementations of Message.
511+
// e.g. IMAPMessage has a different implementation of those two methods.
512+
506513
// Copy messages to cause an eager fetch
507514
if (this.headerMapper == null && (this.autoCloseFolder || this.simpleContent)) {
508515
Message[] originalMessages = new Message[filteredMessages.length];

spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
* @author Artem Bilan
110110
* @author Alexander Pinske
111111
* @author Dominik Simmen
112+
* @author Filip Hrisafov
112113
*/
113114
@SpringJUnitConfig
114115
@ContextConfiguration(

0 commit comments

Comments
 (0)