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

Combine XMLRPC and EXTERNAL execution in RequestEvaluator.run()

Browse source
This commit is contained in:
hns 2003-12-15 15:19:19 +00:00
parent f2802894fa
commit 09d983bd29
1 changed files with 8 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -433,9 +433,10 @@ public final class RequestEvaluator implements Runnable {
break; break;
case XMLRPC: case XMLRPC:
case EXTERNAL:
try { try {
localrtx.begin(app.getName() + ":xmlrpc:" + method); localrtx.begin(app.getName() + ":ext-rpc:" + method);
root = app.getDataRoot(); root = app.getDataRoot();
@ -469,70 +470,11 @@ public final class RequestEvaluator implements Runnable {
method = st.nextToken(); method = st.nextToken();
} }
if (reqtype == XMLRPC) {
// check XML-RPC access permissions // check XML-RPC access permissions
String proto = app.getPrototypeName(currentElement); String proto = app.getPrototypeName(currentElement);
app.checkXmlRpcAccess(proto, method); app.checkXmlRpcAccess(proto, method);
// reset skin recursion detection counter
skinDepth = 0;
result = scriptingEngine.invoke(currentElement, method, args,
true);
commitTransaction();
} catch (Exception x) {
abortTransaction(false);
app.logEvent("Exception in " + Thread.currentThread() + ": " +
x);
// If the transactor thread has been killed by the invoker thread we don't have to
// bother for the error message, just quit.
if (localrtx != rtx) {
return;
}
this.exception = x;
}
break;
case EXTERNAL:
try {
localrtx.begin(app.getName() + ":external:" + method);
root = app.getDataRoot();
HashMap globals = new HashMap();
globals.put("root", root);
globals.put("res", new ResponseBean(res));
globals.put("app", new ApplicationBean(app));
scriptingEngine.enterContext(globals);
currentElement = root;
if (method.indexOf('.') > -1) {
StringTokenizer st = new StringTokenizer(method, ".");
int cnt = st.countTokens();
for (int i = 1; i < cnt; i++) {
String next = st.nextToken();
currentElement = getChildElement(currentElement,
next);
}
if (currentElement == null) {
throw new FrameworkException("Method name \"" +
method +
"\" could not be resolved.");
}
method = st.nextToken();
} }
// reset skin recursion detection counter // reset skin recursion detection counter