[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jmeter-dev
Subject:    svn commit: r728228 - in /jakarta/jmeter/trunk:
From:       sebb () apache ! org
Date:       2008-12-20 3:54:41
Message-ID: 20081220035441.6DE61238898F () eris ! apache ! org
[Download RAW message or body]

Author: sebb
Date: Fri Dec 19 19:54:40 2008
New Revision: 728228

URL: http://svn.apache.org/viewvc?rev=728228&view=rev
Log:
Bug 46407 - BSF elements do not load script files, attempt to interpret filename as \
script

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java?rev=728228&r1=728227&r2=728228&view=diff
 ==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java \
                (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java Fri Dec \
19 19:54:40 2008 @@ -18,6 +18,8 @@
 
 package org.apache.jmeter.util;
 
+import java.io.File;
+import java.io.IOException;
 import java.io.PrintStream;
 import java.io.Serializable;
 import java.util.Properties;
@@ -25,6 +27,7 @@
 import org.apache.bsf.BSFEngine;
 import org.apache.bsf.BSFException;
 import org.apache.bsf.BSFManager;
+import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.AbstractTestElement;
@@ -126,8 +129,15 @@
         final String scriptFile = getFilename();
         if (scriptFile.length() == 0) {
             bsfEngine.exec("[script]",0,0,getScript());
+        } else {// we have a file, read and process it
+            try {
+                String script=FileUtils.readFileToString(new File(scriptFile));
+                bsfEngine.exec(scriptFile,0,0,script);
+            } catch (IOException e) {
+                log.warn(e.getLocalizedMessage());
+                throw new BSFException(BSFException.REASON_IO_ERROR,"Problem reading \
script file",e); +            }
         }
-        bsfEngine.exec(scriptFile,0,0,scriptFile);
     }
 
     /**

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=728228&r1=728227&r2=728228&view=diff
 ==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Dec 19 19:54:40 2008
@@ -170,6 +170,7 @@
 <li>Fix Java 1.6 https error: java.net.SocketException: Unconnected sockets not \
implemented</li>  <li>Bug 46359 - BSF JavaScript Preprocessor cannot access sampler \
variable on first interation (Implement temporary work-round for BSF-22)</li>  \
<li>Bug 46332 - HTTP Cookie Manager ignores manually defined cookies (bug introduced \
in r707810)</li> +<li>Bug 46407 - BSF elements do not load script files, attempt to \
interpret filename as script</li>  </ul>
 
 <h3>Improvements</h3>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]