cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r488049 - /cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Date Sun, 17 Dec 2006 21:13:38 GMT
Author: joerg
Date: Sun Dec 17 13:13:38 2006
New Revision: 488049

URL: http://svn.apache.org/viewvc?view=rev&rev=488049
Log:
COCOON-1811: Allow dynamic loading of JavaScript objects even when scope is locked.
don't handle PropertyException by removing information about root cause

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=488049&r1=488048&r2=488049
==============================================================================
--- 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
Sun Dec 17 13:13:38 2006
@@ -34,7 +34,6 @@
 import org.apache.avalon.framework.service.ServiceManager;
 
 import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.components.flow.CompilingInterpreter;
 import org.apache.cocoon.components.flow.Interpreter;
 import org.apache.cocoon.components.flow.InvalidContinuationException;
@@ -61,7 +60,6 @@
 import org.mozilla.javascript.JavaScriptException;
 import org.mozilla.javascript.NativeJavaClass;
 import org.mozilla.javascript.NativeJavaPackage;
-import org.mozilla.javascript.PropertyException;
 import org.mozilla.javascript.Script;
 import org.mozilla.javascript.ScriptRuntime;
 import org.mozilla.javascript.Scriptable;
@@ -71,7 +69,6 @@
 import org.mozilla.javascript.tools.debugger.Main;
 import org.mozilla.javascript.tools.shell.Global;
 
-
 /**
  * Interface with the JavaScript interpreter.
  *
@@ -267,13 +264,9 @@
             final Context context = Context.getCurrentContext();
 
             final String[] names = { "importClass" };
-            try {
-                defineFunctionProperties(names,
-                                         ThreadScope.class,
-                                         ScriptableObject.DONTENUM);
-            } catch (PropertyException e) {
-                throw new Error();  // should never happen
-            }
+            defineFunctionProperties(names,
+                                     ThreadScope.class,
+                                     ScriptableObject.DONTENUM);
 
             setPrototype(scope);
 



Mime
View raw message