You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2004/09/18 14:24:12 UTC
cvs commit: jakarta-jmeter/src/functions/org/apache/jmeter/functions JavaScript.java
sebb 2004/09/18 05:24:12
Modified: src/functions/org/apache/jmeter/functions Tag: rel-2_0
JavaScript.java
Log:
Catch and log extra scripting errors
Revision Changes Path
No revision
No revision
1.6.2.1 +17 -1 jakarta-jmeter/src/functions/org/apache/jmeter/functions/JavaScript.java
Index: JavaScript.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/JavaScript.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- JavaScript.java 10 Feb 2004 00:35:12 -0000 1.6
+++ JavaScript.java 18 Sep 2004 12:24:12 -0000 1.6.2.1
@@ -28,15 +28,20 @@
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
import org.mozilla.javascript.Context;
+import org.mozilla.javascript.EcmaError;
import org.mozilla.javascript.JavaScriptException;
import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.WrappedException;
public class JavaScript extends AbstractFunction implements Serializable
{
private static final List desc = new LinkedList();
private static final String KEY = "__javaScript";
+ private static Logger log = LoggingManager.getLoggerForClass();
static {
desc.add("JavaScript expression to evaluate");
@@ -82,8 +87,19 @@
vars.put(varName, resultStr);
}
+ catch (WrappedException e)
+ {
+ log.error("Error processing Javascript",e);
+ throw new InvalidVariableException();
+ }
+ catch (EcmaError e)
+ {
+ log.error("Error processing Javascript",e);
+ throw new InvalidVariableException();
+ }
catch (JavaScriptException e)
{
+ log.error("Error processing Javascript",e);
throw new InvalidVariableException();
}
finally
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org