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

* Mark all changing fields as volatile.

Browse source 
* Issue a warning if a non-existing function was invoked.
This commit is contained in:
hns 2007-03-22 15:18:47 +00:00
parent b6d72d79af
commit 0b363a4b96
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/helma/framework/core/RequestEvaluator.java
View file

@ -60,22 +60,22 @@ public final class RequestEvaluator implements Runnable {
private volatile int reqtype; private volatile int reqtype;
// the object on which to invoke a function, if specified // the object on which to invoke a function, if specified
private Object thisObject; private volatile Object thisObject;
// the method to be executed // the method to be executed
private String functionName; private volatile String functionName;
// the session object associated with the current request // the session object associated with the current request
private Session session; private volatile Session session;
// arguments passed to the function // arguments passed to the function
private Object[] args; private volatile Object[] args;
// the result of the operation // the result of the operation
private Object result; private volatile Object result;
// the exception thrown by the evaluator, if any. // the exception thrown by the evaluator, if any.
private Exception exception; private volatile Exception exception;
/** /**
* Create a new RequestEvaluator for this application. * Create a new RequestEvaluator for this application.
@ -179,6 +179,7 @@ public final class RequestEvaluator implements Runnable {
// If function doesn't exist, return immediately // If function doesn't exist, return immediately
if (functionName.indexOf('.') < 0 && if (functionName.indexOf('.') < 0 &&
!scriptingEngine.hasFunction(thisObject, functionName)) { !scriptingEngine.hasFunction(thisObject, functionName)) {
app.logEvent(missingFunctionMessage(thisObject, functionName));
done = true; done = true;
reqtype = NONE; reqtype = NONE;
break; break;
@ -445,7 +446,9 @@ public final class RequestEvaluator implements Runnable {
// reset skin recursion detection counter // reset skin recursion detection counter
skinDepth = 0; skinDepth = 0;
if (!scriptingEngine.hasFunction(currentElement, functionName)) {
throw new FrameworkException(missingFunctionMessage(currentElement, functionName));
}
result = scriptingEngine.invoke(currentElement, result = scriptingEngine.invoke(currentElement,
functionName, args, functionName, args,
ScriptingEngine.ARGS_WRAP_XMLRPC, ScriptingEngine.ARGS_WRAP_XMLRPC,
@ -479,6 +482,10 @@ public final class RequestEvaluator implements Runnable {
// reset skin recursion detection counter // reset skin recursion detection counter
skinDepth = 0; skinDepth = 0;
if (!scriptingEngine.hasFunction(thisObject, functionName)) {
throw new FrameworkException(missingFunctionMessage(thisObject, functionName));
}
result = scriptingEngine.invoke(thisObject, result = scriptingEngine.invoke(thisObject,
functionName, functionName,
args, args,
@ -1091,4 +1098,11 @@ public final class RequestEvaluator implements Runnable {
public synchronized Session getSession() { public synchronized Session getSession() {
return session; return session;
} }
private String missingFunctionMessage(Object obj, String funcName) {
if (obj == null)
return "Function " + funcName + " not defined in global scope";
else
return "Function " + funcName + " not defined for " + obj;
}
} }