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

throw EvaluatorException instead of RuntimeException to prevent Rhino exception wrapping

Browse source
This commit is contained in:
hns 2003-10-23 11:44:58 +00:00
parent 72e12535f6
commit ccf197aeac
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/helma/scripting/rhino/RhinoCore.java
View file

@ -361,11 +361,11 @@ public final class RhinoCore {
*/ */
public Scriptable getValidPrototype(String protoName) { public Scriptable getValidPrototype(String protoName) {
if (globalError != null) { if (globalError != null) {
throw new RuntimeException(globalError.toString()); throw new EvaluatorException(globalError.toString());
} }
TypeInfo type = getPrototypeInfo(protoName); TypeInfo type = getPrototypeInfo(protoName);
if (type != null && type.error != null) { if (type != null && type.error != null) {
throw new RuntimeException(type.error.toString()); throw new EvaluatorException(type.error.toString());
} }
return type == null ? null : type.objectPrototype; return type == null ? null : type.objectPrototype;
} }
@ -640,11 +640,11 @@ public final class RhinoCore {
result = engine.invoke(handler, hrefFunction, result = engine.invoke(handler, hrefFunction,
new Object[] { basicHref }, false); new Object[] { basicHref }, false);
} catch (ScriptingException x) { } catch (ScriptingException x) {
throw new RuntimeException("Error in hrefFunction: " + x); throw new EvaluatorException("Error in hrefFunction: " + x);
} }
if (result == null) { if (result == null) {
throw new RuntimeException("hrefFunction " + hrefFunction + throw new EvaluatorException("hrefFunction " + hrefFunction +
" returned null"); " returned null");
} }