antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

Do not catch Exceptions when wrapping globals in enterContext() - this makes

Browse source 
us ignore syntax errors in scripts, prevents useful error messages to be displayed
and causes functions to be called in illegal state.
This commit is contained in:
hns 2004-05-25 13:29:54 +00:00
parent c3af34272f
commit bc85445744
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/helma/scripting/rhino/RhinoEngine.java
View file

@ -190,20 +190,16 @@ public class RhinoEngine implements ScriptingEngine {
Object v = globals.get(k);
Scriptable scriptable = null;
try {
// create a special wrapper for the path object.
// other objects are wrapped in the default way.
if (v instanceof RequestPath) {
scriptable = new PathWrapper((RequestPath) v, core);
scriptable.setPrototype(core.pathProto);
} else {
scriptable = Context.toObject(v, global);
}
global.put(k, global, scriptable);
} catch (Exception x) {
app.logEvent("Error setting global variable " + k + ": " + x);
// create a special wrapper for the path object.
// other objects are wrapped in the default way.
if (v instanceof RequestPath) {
scriptable = new PathWrapper((RequestPath) v, core);
scriptable.setPrototype(core.pathProto);
} else {
scriptable = Context.toObject(v, global);
}
global.put(k, global, scriptable);
}
}