From 0910855981fd2305a8cbb3177239402c1931b3f3 Mon Sep 17 00:00:00 2001 From: hns Date: Thu, 4 Jan 2001 12:49:34 +0000 Subject: [PATCH] adapted to fixed Node.getGroupbySubnode --- src/helma/objectmodel/db/NodeManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/helma/objectmodel/db/NodeManager.java b/src/helma/objectmodel/db/NodeManager.java index 74fbf42a..9f5703cf 100644 --- a/src/helma/objectmodel/db/NodeManager.java +++ b/src/helma/objectmodel/db/NodeManager.java @@ -681,6 +681,7 @@ public final class NodeManager { private Node getNodeByRelation (DbWrapper db, DbTxn txn, Node home, String kstr, Relation rel) throws Exception { Node node = null; + if (rel != null && rel.virtual && home.getState() != INode.VIRTUAL) { Key k = home.getKey ().getVirtualKey (kstr); node = (Node) cache.get (k); @@ -712,7 +713,8 @@ public final class NodeManager { } } else if (rel != null && rel.groupby != null) { - return home.getGroupbySubnode (kstr, rel); + return home.getGroupbySubnode (kstr); + } else if (rel == null || rel.other == null || !rel.other.isRelational ()) { node = db.getNode (txn, kstr); node.nmgr = safe;