Apply review feedback

Author: filiphr

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

@@ -504,26 +504,19 @@ private Object byteArrayToContent(Map<String, Object> headers, ByteArrayOutputSt
 	}
 
 	private void postProcessFilteredMessages(Message[] filteredMessages) throws MessagingException {
-		// It is more intuitive use a local variable Message[] messages = filteredMessages;
-		// and then call setMessageFlagsAndMaybeDeleteMessages(messages); after the if, i.e. remove the else.
-		// However, in setMessageFlagsAndMaybeDeleteMessages we are calling Message#setFlag and Message#setFlags
-		// which have different implementations in different implementations of Message.
-		// e.g. IMAPMessage has a different implementation of those two methods.
-
 		// Copy messages to cause an eager fetch
+		Message[] messages = filteredMessages;
 		if (this.headerMapper == null && (this.autoCloseFolder || this.simpleContent)) {
-			Message[] originalMessages = new Message[filteredMessages.length];
+			messages = new Message[filteredMessages.length];
 			for (int i = 0; i < filteredMessages.length; i++) {
 				Message originalMessage = filteredMessages[i];
-				originalMessages[i] = originalMessage;
+				messages[i] = originalMessage;
 				MimeMessage mimeMessage = new IntegrationMimeMessage((MimeMessage) originalMessage);
 				filteredMessages[i] = mimeMessage;
 			}
-			setMessageFlagsAndMaybeDeleteMessages(originalMessages);
-		}
-		else {
-			setMessageFlagsAndMaybeDeleteMessages(filteredMessages);
 		}
+
+		setMessageFlagsAndMaybeDeleteMessages(messages);
 	}
 
 	private void setMessageFlagsAndMaybeDeleteMessages(Message[] messages) throws MessagingException {

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

@@ -1005,10 +1005,12 @@ public void receiveAndMarkAsReadDontDeleteWithThrowingWhenCopying() throws Excep
 				.hasMessage("Simulated exception");
 		assertThat(msg1.getFlags().contains(Flag.SEEN)).isFalse();
 		assertThat(msg2.getFlags().contains(Flag.SEEN)).isFalse();
+		assertThat(msg2.getMyTestFlags().contains(Flag.SEEN)).isFalse();
 
 		receiver.receive();
 		assertThat(msg1.getFlags().contains(Flag.SEEN)).isTrue();
 		assertThat(msg2.getFlags().contains(Flag.SEEN)).isTrue();
+		assertThat(msg2.getMyTestFlags().contains(Flag.SEEN)).isTrue();
 		verify(receiver, times(0)).deleteMessages(Mockito.any());
 	}
 
@@ -1051,6 +1053,8 @@ private static class TestThrowingMimeMessage extends MimeMessage {
 
 		protected final AtomicInteger exceptionsBeforeWrite;
 
+		protected final Flags myTestFlags = new Flags();
+
 		private TestThrowingMimeMessage(MimeMessage source, int exceptionsBeforeWrite) throws MessagingException {
 			super(source);
 			this.exceptionsBeforeWrite = new AtomicInteger(exceptionsBeforeWrite);
@@ -1063,6 +1067,21 @@ public void writeTo(OutputStream os) throws IOException, MessagingException {
 			}
 			super.writeTo(os);
 		}
+
+		@Override
+		public synchronized void setFlags(Flags flag, boolean set) throws MessagingException {
+			super.setFlags(flag, set);
+			if (set) {
+				myTestFlags.add(flag);
+			}
+			else {
+				myTestFlags.remove(flag);
+			}
+		}
+
+		private Flags getMyTestFlags() {
+			return myTestFlags;
+		}
 	}
 
 }