Return first, rather than last, response for pipelined SMTP commands

ippschi · Dec 5, 2018 · 64c6a14 · 64c6a14
1 parent 8b3d516
commit 64c6a14
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
@@ -654,7 +654,7 @@ private void executePipelinedCommands(Queue<String> pipelinedCommands) throws IO
     private void readPipelinedResponse(Queue<String> pipelinedCommands) throws IOException, MessagingException {
         String responseLine;
         List<String> results = new ArrayList<>();
-        NegativeSmtpReplyException negativeRecipient = null;
+        NegativeSmtpReplyException firstNegativeResponse = null;
         for (String command : pipelinedCommands) {
             results.clear();
             responseLine = readCommandResponseLine(results);
@@ -665,18 +665,18 @@ private void readPipelinedResponse(Queue<String> pipelinedCommands) throws IOExc
                 if (command.equals("DATA")) {
                     throw exception;
                 }
-                if (command.startsWith("RCPT")) {
-                    negativeRecipient = (NegativeSmtpReplyException) exception;
+                if (command.startsWith("RCPT") && firstNegativeResponse == null) {
+                    firstNegativeResponse = (NegativeSmtpReplyException) exception;
                 }
             }
         }
 
-        if (negativeRecipient != null) {
+        if (firstNegativeResponse != null) {
             try {
                 executeCommand(".");
-                throw negativeRecipient;
+                throw firstNegativeResponse;
             } catch (NegativeSmtpReplyException e) {
-                throw negativeRecipient;
+                throw firstNegativeResponse;
             }
         }