You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/06/14 22:19:15 UTC
svn commit: r547391 -
/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Author: vgritsenko
Date: Thu Jun 14 13:19:14 2007
New Revision: 547391
URL: http://svn.apache.org/viewvc?view=rev&rev=547391
Log:
exception handling in continuation should be same as for function call
Modified:
cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Modified: cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java?view=diff&rev=547391&r1=547390&r2=547391
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java (original)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Thu Jun 14 13:19:14 2007
@@ -600,12 +600,12 @@
thrScope.setLock(true);
ScriptRuntime.call(context, fun, thrScope, new Object[0], thrScope);
- } catch (JavaScriptException ex) {
- throw locationTracker.getException("Error calling flowscript function " + funName, ex);
- } catch (EcmaError ee) {
- throw locationTracker.getException("Error calling function " + funName, ee);
- } catch (WrappedException ee) {
- throw locationTracker.getException("Error calling function " + funName, ee);
+ } catch (JavaScriptException e) {
+ throw locationTracker.getException("Error calling flowscript function " + funName, e);
+ } catch (EcmaError e) {
+ throw locationTracker.getException("Error calling function " + funName, e);
+ } catch (WrappedException e) {
+ throw locationTracker.getException("Error calling function " + funName, e);
}
} finally {
thrScope.setLock(false);
@@ -680,10 +680,12 @@
try {
ScriptableObject.callMethod(cocoon,
"handleContinuation", args);
- } catch (JavaScriptException ex) {
- throw locationTracker.getException("Error calling continuation", ex);
- } catch (EcmaError ee) {
- throw locationTracker.getException("Error calling continuation", ee);
+ } catch (JavaScriptException e) {
+ throw locationTracker.getException("Error calling continuation", e);
+ } catch (EcmaError e) {
+ throw locationTracker.getException("Error calling continuation", e);
+ } catch (WrappedException e) {
+ throw locationTracker.getException("Error calling continuation", e);
}
} finally {
kScope.setLock(false);