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

Consult the macro handler map in the response object rather than the request path

Browse source 
when resolving macro handler names. By default the new handler map contains the
objects from the request path, but it lets the developer add or remove handlers.

Improved the way macros are displayed and logged.
This commit is contained in:
hns 2002-10-30 17:45:38 +00:00
parent 2faba077fa
commit 8f684b6ec9
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/helma/framework/core/Skin.java
View file

@ -340,14 +340,15 @@ public final class Skin {
if (handlerObject == null) {
// eiter because thisObject == null or the right object wasn't found in the object's parent path
// go check request path for an object with matching prototype
int l = reval.requestPath.size();
/* int l = reval.requestPath.size();
for (int i=l-1; i>=0; i--) {
Object pathelem = reval.requestPath.get (i);
if (handler.equals (app.getPrototypeName (pathelem))) {
handlerObject = pathelem;
break;
}
}
} */
handlerObject = reval.res.getMacroHandlers().get (handler);
}
// the macro handler object couldn't be found
@ -417,8 +418,11 @@ public final class Skin {
} catch (TimeoutException timeout) {
throw timeout;
} catch (Exception x) {
x.printStackTrace();
String msg = "[HopMacro error in "+getFullName()+": "+x+"]";
// x.printStackTrace();
String msg = x.getMessage();
if (msg == null || msg.length() < 10)
msg = x.toString();
msg = "[HopMacro error in "+getFullName()+": "+msg+"]";
reval.res.write (" "+msg+" ");
app.logEvent (msg);
}