svn commit: r1802515 - in /jmeter/trunk: src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java xdocs/changes.xml

[fs...@apache.org]

Author: fschumacher
Date: Thu Jul 20 17:28:59 2017
New Revision: 1802515

URL: http://svn.apache.org/viewvc?rev=1802515&view=rev
Log:
Fix regression: SMTP Sampler could not send mails, when no attachements where specified.

Bugzilla Id: 61319

Modified:
    jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java?rev=1802515&r1=1802514&r2=1802515&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java Thu Jul 20 17:28:59 2017
@@ -206,6 +206,7 @@ public class SmtpSampler extends Abstrac
     private List<File> getAttachmentFiles() {
         final String[] attachments = getPropertyAsString(ATTACH_FILE).split(FILENAME_SEPARATOR);
         return Arrays.stream(attachments) // NOSONAR No need to close
+                .filter(s -> !s.isEmpty())
                 .map(this::attachmentToFile)
                 .collect(Collectors.toList());
     }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1802515&r1=1802514&r2=1802515&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Jul 20 17:28:59 2017
@@ -161,6 +161,7 @@ Summary
 <ul>
     <li><bug>60889</bug>JMeter JDBC sample calls SELECT USER() when testing with MySQL JDBC due to Connection#toString call for response headers.</li>
     <li><bug>61259</bug>JDBC Request : since JMeter 3.0, when JDBC auto-commit is false, a rollback statement happens each time a Request is executed</li>
+    <li><bug>61319</bug>Fix regression: SMTP Sampler could not send mails, when no attachements where specified.</li>
 </ul>
 
 <h3>Controllers</h3>