From 679462fd88fea0c1a27b924858bf236650dab654 Mon Sep 17 00:00:00 2001 From: Luca Maragnani Date: Wed, 13 Apr 2016 14:01:56 +0200 Subject: [PATCH 1/2] Close SMTP connection in case of exception --- .../smtp/sampler/protocol/SendMailCommand.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java b/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java index 94e4f07fa49..300d4444283 100644 --- a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java +++ b/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java @@ -302,16 +302,18 @@ public void execute(Message message) throws MessagingException, IOException, Int } else { tr.connect(); } + + try { + tr.sendMessage(message, message.getAllRecipients()); - tr.sendMessage(message, message.getAllRecipients()); - - if (listener != null /*synchronousMode==true*/) { - listener.attend(); // listener cannot be null here + if (listener != null /*synchronousMode==true*/) { + listener.attend(); // listener cannot be null here + } + } finally { + tr.close(); + logger.debug("transport closed"); } - - tr.close(); - logger.debug("transport closed"); - + logger.debug("message sent"); return; } From cfcccdc44885ac403d6b0f6f2215a2b89e5beaa8 Mon Sep 17 00:00:00 2001 From: Luca Maragnani Date: Wed, 13 Apr 2016 14:01:56 +0200 Subject: [PATCH 2/2] Close SMTP connection in case of exception --- .../smtp/sampler/protocol/SendMailCommand.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java b/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java index 94e4f07fa49..300d4444283 100644 --- a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java +++ b/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java @@ -302,16 +302,18 @@ public void execute(Message message) throws MessagingException, IOException, Int } else { tr.connect(); } + + try { + tr.sendMessage(message, message.getAllRecipients()); - tr.sendMessage(message, message.getAllRecipients()); - - if (listener != null /*synchronousMode==true*/) { - listener.attend(); // listener cannot be null here + if (listener != null /*synchronousMode==true*/) { + listener.attend(); // listener cannot be null here + } + } finally { + tr.close(); + logger.debug("transport closed"); } - - tr.close(); - logger.debug("transport closed"); - + logger.debug("message sent"); return; }