From 6cda9fc22495e84761839bff25ef0c7ca2242458 Mon Sep 17 00:00:00 2001 From: hns Date: Sat, 4 Aug 2001 11:47:36 +0000 Subject: [PATCH] Node.getSubnode() does not do a getNode() (property getter) as fallback anymore, so we have to do that explicitly in the URL path resolving code. --- src/helma/framework/core/RequestEvaluator.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/helma/framework/core/RequestEvaluator.java b/src/helma/framework/core/RequestEvaluator.java index 6fbcca34..be26e190 100644 --- a/src/helma/framework/core/RequestEvaluator.java +++ b/src/helma/framework/core/RequestEvaluator.java @@ -272,8 +272,13 @@ public class RequestEvaluator implements Runnable { continue; if (isProperty) // get next element as property currentNode = currentNode.getNode (pathItems[i], false); - else // get next element as subnode - currentNode = currentNode.getSubnode (pathItems[i]); + else { + // try to get next element as subnode first, then fall back to property + INode nextNode = currentNode.getSubnode (pathItems[i]); + if (nextNode == null) + nextNode = currentNode.getNode (pathItems[i], false); + currentNode = nextNode; + } isProperty = false; // add object to request path if suitable