svn commit: r1735171 - /jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java

[pm...@apache.org]

Author: pmouawad
Date: Tue Mar 15 21:39:17 2016
New Revision: 1735171

URL: http://svn.apache.org/viewvc?rev=1735171&view=rev
Log:
Use Java7 try with resources

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.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=1735171&r1=1735170&r2=1735171&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 Tue Mar 15 21:39:17 2016
@@ -23,11 +23,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.assertions.AssertionResult;
 import org.apache.jmeter.samplers.SampleEvent;
 import org.apache.jmeter.samplers.SampleResult;
@@ -455,24 +453,20 @@ public class SampleResultConverter exten
     }
 
     protected void readFile(String resultFileName, SampleResult res) {
-        File in = null;
-        InputStream fis = null;
-        try {
-            in = new File(resultFileName);
-            fis = new BufferedInputStream(new FileInputStream(in));
+        File in = new File(resultFileName);
+        try (FileInputStream fis = new FileInputStream(in);
+                BufferedInputStream bis = new BufferedInputStream(fis)){
             ByteArrayOutputStream outstream = new ByteArrayOutputStream(res.getBytes());
             byte[] buffer = new byte[4096];
             int len;
-            while ((len = fis.read(buffer)) > 0) {
+            while ((len = bis.read(buffer)) > 0) {
                 outstream.write(buffer, 0, len);
             }
             outstream.close();
             res.setResponseData(outstream.toByteArray());
         } catch (IOException e) {
             log.warn(e.getLocalizedMessage());
-        } finally {
-            IOUtils.closeQuietly(fis);
-        }
+        } 
     }