added if(lastcommand) in catch block
@@ -655,26 +655,19 @@ public class SmtpTransport extends Transport {
String responseLine = null;
List<String> results = new ArrayList<>();
while (noOfPipelinedResponse > 0) {
+ noOfPipelinedResponse--;
results.clear();
responseLine = readCommandResponseLine(results);
try {
responseLineToCommandResponse(responseLine, results);
- } catch (NegativeSmtpReplyException exception) {
- //continue reading response till DATA response .
- Timber.d("SMTP <<< " + exception.getReplyCode() + exception.getReplyText());
-
} catch (MessagingException exception) {
- //continue reading response till DATA response .
-
+ if (noOfPipelinedResponse == 0) {
+ throw exception;
}
- noOfPipelinedResponse-- ;
+ Timber.d("SMTP <<< " + exception.getMessage());
+ //continue reading response till DATA response .
}
-
- try {
- responseLineToCommandResponse(responseLine, results);
- } catch (NegativeSmtpReplyException exception) {
- throw exception;
}
}
