You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/01/26 19:48:23 UTC
svn commit: r1780447 -
/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
Author: pmouawad
Date: Thu Jan 26 19:48:23 2017
New Revision: 1780447
URL: http://svn.apache.org/viewvc?rev=1780447&view=rev
Log:
Simplify code
Modified:
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java?rev=1780447&r1=1780446&r2=1780447&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java Thu Jan 26 19:48:23 2017
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -207,12 +208,9 @@ public class SendMailCommand {
(attachmentCount == 0 || (mailBody.length() == 0 && attachmentCount == 1))) {
if (attachmentCount == 1) { // i.e. mailBody is empty
File first = attachments.get(0);
- InputStream is = null;
- try {
- is = new BufferedInputStream(new FileInputStream(first));
- message.setText(IOUtils.toString(is));
- } finally {
- IOUtils.closeQuietly(is);
+ try (FileInputStream fis = new FileInputStream(first);
+ InputStream is = new BufferedInputStream(fis)){
+ message.setText(IOUtils.toString(is, Charset.defaultCharset()));
}
} else {
message.setText(mailBody);