Author: sebb
Date: Tue Nov 3 15:11:52 2009
New Revision: 832448
URL: http://svn.apache.org/viewvc?rev=832448&view=rev
Log:
Return result of script execution so can be used by Sampler
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java?rev=832448&r1=832447&r2=832448&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java
Tue Nov 3 15:11:52 2009
@@ -118,13 +118,13 @@
}
- protected void processFileOrScript(ScriptEngineManager sem) throws
IOException, ScriptException {
+ protected Object processFileOrScript(ScriptEngineManager sem) throws
IOException, ScriptException {
final String lang = getScriptLanguage();
ScriptEngine scriptEngine = sem.getEngineByName(lang);
if (scriptEngine == null) {
log.error("Unsupported scripting engine: "+lang);
- return;
+ return null;
}
File scriptFile = new File(getFilename());
@@ -132,12 +132,12 @@
BufferedReader fileReader = null;
try {
fileReader = new BufferedReader(new FileReader(scriptFile));
- scriptEngine.eval(fileReader);
+ return scriptEngine.eval(fileReader);
} finally {
IOUtils.closeQuietly(fileReader);
}
} else {
- scriptEngine.eval(getScript());
+ return scriptEngine.eval(getScript());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
