You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2017/02/22 17:13:53 UTC

svn commit: r1784039 - /jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java

Author: sebb
Date: Wed Feb 22 17:13:52 2017
New Revision: 1784039

URL: http://svn.apache.org/viewvc?rev=1784039&view=rev
Log:
Default charset OK here

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java?rev=1784039&r1=1784038&r2=1784039&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java Wed Feb 22 17:13:52 2017
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.Serializable;
+import java.nio.charset.Charset;
 import java.util.Properties;
 
 import org.apache.bsf.BSFEngine;
@@ -98,7 +99,7 @@ public abstract class BSFTestElement ext
             bsfEngine.exec("[script]",0,0,getScript());
         } else {// we have a file, read and process it
             try {
-                String script=FileUtils.readFileToString(new File(scriptFile));
+                String script=FileUtils.readFileToString(new File(scriptFile), Charset.defaultCharset());
                 bsfEngine.exec(scriptFile,0,0,script);
             } catch (IOException e) {
                 if (log.isWarnEnabled()) {
@@ -116,7 +117,7 @@ public abstract class BSFTestElement ext
             return bsfEngine.eval("[script]",0,0,getScript());
         } else {// we have a file, read and process it
             try {
-                String script=FileUtils.readFileToString(new File(scriptFile));
+                String script=FileUtils.readFileToString(new File(scriptFile), Charset.defaultCharset());
                 return bsfEngine.eval(scriptFile,0,0,script);
             } catch (IOException e) {
                 if (log.isWarnEnabled()) {