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:38:15 UTC
svn commit: r1382569 - in /jmeter/trunk/src/core/org/apache/jmeter:
save/converters/SampleResultConverter.java util/SSLManager.java
Author: pmouawad
Date: Sun Sep 9 20:38:15 2012
New Revision: 1382569
URL: http://svn.apache.org/viewvc?rev=1382569&view=rev
Log:
Use BufferedOutputStream
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=1382569&r1=1382568&r2=1382569&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java Sun Sep 9 20:38:15 2012
@@ -18,11 +18,13 @@
package org.apache.jmeter.save.converters;
+import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URL;
@@ -36,12 +38,12 @@ import org.apache.jorphan.logging.Loggin
import org.apache.jorphan.util.Converter;
import org.apache.log.Logger;
-import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.mapper.Mapper;
/**
* XStream Converter for the SampleResult class
@@ -391,10 +393,10 @@ public class SampleResultConverter exten
protected void readFile(String resultFileName, SampleResult res) {
File in = null;
- FileInputStream fis = null;
+ InputStream fis = null;
try {
in = new File(resultFileName);
- fis = new FileInputStream(in);
+ fis = new BufferedInputStream(new FileInputStream(in));
ByteArrayOutputStream outstream = new ByteArrayOutputStream(res.getBytes());
byte[] buffer = new byte[4096];
int len;
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java?rev=1382569&r1=1382568&r2=1382569&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java Sun Sep 9 20:38:15 2012
@@ -18,8 +18,10 @@
package org.apache.jmeter.util;
+import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.InputStream;
import java.net.HttpURLConnection;
import java.security.KeyStore;
import java.security.Provider;
@@ -115,12 +117,12 @@ public abstract class SSLManager {
this.keyStore = null;
throw new RuntimeException("Could not create keystore: "+e.getMessage(), e);
}
- FileInputStream fileInputStream = null;
+ InputStream fileInputStream = null;
try {
File initStore = new File(fileName);
if (fileName.length() >0 && initStore.exists()) {
- fileInputStream = new FileInputStream(initStore);
+ fileInputStream = new BufferedInputStream(new FileInputStream(initStore));
this.keyStore.load(fileInputStream, getPassword());
if (log.isInfoEnabled()) {
log.info("Total of " + keyStore.getAliasCount() + " aliases loaded OK from keystore");
@@ -206,12 +208,12 @@ public abstract class SSLManager {
throw new RuntimeException("Problem creating truststore: "+e.getMessage(), e);
}
- FileInputStream fileInputStream = null;
+ InputStream fileInputStream = null;
try {
File initStore = new File(fileName);
if (initStore.exists()) {
- fileInputStream = new FileInputStream(initStore);
+ fileInputStream = new BufferedInputStream(new FileInputStream(initStore));
this.trustStore.load(fileInputStream, null);
log.info("Truststore loaded OK from file");
} else {