svn commit: r1780446 - /jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java

[pmouawad]

Author: pmouawad
Date: Thu Jan 26 19:46:53 2017
New Revision: 1780446

URL: http://svn.apache.org/viewvc?rev=1780446&view=rev
Log:
Simplify code
Remove commented code

Modified:
    
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java

Modified: 
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java?rev=1780446&r1=1780445&r2=1780446&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
 (original)
+++ 
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
 Thu Jan 26 19:46:53 2017
@@ -20,7 +20,7 @@ package org.apache.jmeter.protocol.java.
 
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
-import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -66,7 +66,7 @@ public class BSFSampler extends BSFTestE
         log.debug(label + " " + fileName);
         SampleResult res = new SampleResult();
         res.setSampleLabel(label);
-        InputStream is = null;
+        
         BSFEngine bsfEngine = null;
         // There's little point saving the manager between invocations
         // as we need to reset most of the beans anyway
@@ -91,8 +91,10 @@ public class BSFSampler extends BSFTestE
             Object bsfOut = null;
             if (fileName.length()>0) {
                 res.setSamplerData("File: "+fileName);
-                is = new BufferedInputStream(new FileInputStream(fileName));
-                bsfOut = bsfEngine.eval(fileName, 0, 0, IOUtils.toString(is));
+                try (FileInputStream fis = new FileInputStream(fileName); 
+                        BufferedInputStream is = new BufferedInputStream(fis)) 
{
+                    bsfOut = bsfEngine.eval(fileName, 0, 0, 
IOUtils.toString(is, Charset.defaultCharset()));
+                }
             } else {
                 res.setSamplerData(request);
                 bsfOut = bsfEngine.eval("script", 0, 0, request);
@@ -113,11 +115,6 @@ public class BSFSampler extends BSFTestE
             res.setResponseMessage(ex.toString());
         } finally {
             res.sampleEnd();
-            IOUtils.closeQuietly(is);
-// Will be done by mgr.terminate() anyway
-//          if (bsfEngine != null) {
-//              bsfEngine.terminate();
-//          }
             mgr.terminate();
         }