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

also add objects without prototype to path array.

Browse source
This commit is contained in:
hns 2001-08-01 00:00:45 +00:00
parent bd0441cda5
commit d9b92c75e9
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -211,6 +211,8 @@ public class RequestEvaluator implements Runnable {
reqPath.putHiddenProperty ("root", current); reqPath.putHiddenProperty ("root", current);
Prototype p = app.getPrototype (root); Prototype p = app.getPrototype (root);
action = p.getActionOrTemplate (null); action = p.getActionOrTemplate (null);
if (action == null)
throw new FrameworkException ("Action not found");
} else { } else {
@ -276,11 +278,12 @@ public class RequestEvaluator implements Runnable {
// add object to request path if suitable // add object to request path if suitable
if (currentNode != null) { if (currentNode != null) {
String pt = currentNode.getPrototype ();
if (pt != null) {
// add to reqPath array // add to reqPath array
current = getNodeWrapper (currentNode); current = getNodeWrapper (currentNode);
reqPath.putProperty (reqPath.size(), current); reqPath.putProperty (reqPath.size(), current);
String pt = currentNode.getPrototype ();
if (pt != null) {
// if a prototype exists, add also by prototype name
reqPath.putHiddenProperty (pt, current); reqPath.putHiddenProperty (pt, current);
} }
} }
@ -826,7 +829,7 @@ public class RequestEvaluator implements Runnable {
} else { } else {
// the user node may have changed (login/logout) while the ESUser was // the user node may have changed (login/logout) while the ESUser was
// lingering in the cache. // lingering in the cache.
esn.updateNode (); esn.updateNodeFromUser ();
} }
return esn; return esn;