svn commit: r889032 - /jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java

Author: sebb
Date: Thu Dec 10 00:19:02 2009
New Revision: 889032

URL: http://svn.apache.org/viewvc?rev=889032&view=rev
Log:
Use generic error to catch any processing errors

Modified:
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java?rev=889032&r1=889031&r2=889032&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java Thu Dec 10 00:19:02 2009
@@ -32,10 +32,8 @@
 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.RhinoException;
 import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.WrappedException;
 
 public class JavaScript extends AbstractFunction {
 
@@ -90,13 +88,7 @@
                 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) {
+        } catch (RhinoException e) {
             log.error("Error processing Javascript", e);
             throw new InvalidVariableException();
         } finally {