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 2012/09/09 22:39:17 UTC
svn commit: r1382571 - in
/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol:
mail/sampler/MailFileFolder.java
smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java
smtp/sampler/protocol/SendMailCommand.java
Author: pmouawad
Date: Sun Sep 9 20:39:16 2012
New Revision: 1382571
URL: http://svn.apache.org/viewvc?rev=1382571&view=rev
Log:
Use BufferedOutputStream
Modified:
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java?rev=1382571&r1=1382570&r2=1382571&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java Sun Sep 9 20:39:16 2012
@@ -18,10 +18,12 @@
package org.apache.jmeter.protocol.mail.sampler;
+import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FilenameFilter;
+import java.io.InputStream;
import javax.mail.Flags;
import javax.mail.Folder;
@@ -112,7 +114,7 @@ public class MailFileFolder extends Fold
f = new File(folderPath,String.format(FILENAME_FORMAT, Integer.valueOf(index)));
}
try {
- FileInputStream fis = new FileInputStream(f);
+ InputStream fis = new BufferedInputStream(new FileInputStream(f));
try {
Message m = new MailFileMessage(this, fis, index);
return m;
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java?rev=1382571&r1=1382570&r2=1382571&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java Sun Sep 9 20:39:16 2012
@@ -18,9 +18,11 @@
package org.apache.jmeter.protocol.smtp.sampler.protocol;
+import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.InetAddress;
import java.net.Socket;
import java.security.KeyStore;
@@ -44,9 +46,9 @@ public class LocalTrustStoreSSLSocketFac
SSLContext sslcontext = null;
try {
KeyStore ks = KeyStore.getInstance("JKS"); // $NON-NLS-1$
- FileInputStream stream = null;
+ InputStream stream = null;
try {
- stream = new FileInputStream(truststore);
+ stream = new BufferedInputStream(new FileInputStream(truststore));
ks.load(stream, null);
} finally {
IOUtils.closeQuietly(stream);
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=1382571&r1=1382570&r2=1382571&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 Sun Sep 9 20:39:16 2012
@@ -18,6 +18,7 @@
package org.apache.jmeter.protocol.smtp.sampler.protocol;
+import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -174,7 +175,7 @@ public class SendMailCommand {
Message message;
if (sendEmlMessage) {
- message = new MimeMessage(session, new FileInputStream(emlMessage));
+ message = new MimeMessage(session, new BufferedInputStream(new FileInputStream(emlMessage)));
} else {
message = new MimeMessage(session);
// handle body and attachments
@@ -186,7 +187,7 @@ public class SendMailCommand {
File first = attachments.get(0);
InputStream is = null;
try {
- is = new FileInputStream(first);
+ is = new BufferedInputStream(new FileInputStream(first));
message.setText(IOUtils.toString(is));
} finally {
IOUtils.closeQuietly(is);