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

* Do not try to get child nodes from NodeManager if self is transient

Browse source 
* Throw an exception when trying to get a group-subnode from a
   transient node (it doesn't work, so better be clear about it)
* Do not set "name" property in groupby nodes, just stick with "groupname"
* Always set node properties in propMap if self is transient
This commit is contained in:
hns 2004-02-04 16:30:31 +00:00
parent e3cbb5a732
commit 3101e32ad3
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/helma/objectmodel/db/Node.java
View file

@ -1004,7 +1004,7 @@ public final class Node implements INode, Serializable {
rel = dbmap.getSubnodeRelation(); rel = dbmap.getSubnodeRelation();
if ((rel != null) && (rel.groupby != null || rel.accessName != null)) { if ((rel != null) && (rel.groupby != null || rel.accessName != null)) {
if ((rel.otherType != null) && rel.otherType.isRelational()) { if (state != TRANSIENT && rel.otherType != null && rel.otherType.isRelational()) {
return nmgr.getNode(this, name, rel); return nmgr.getNode(this, name, rel);
} else { } else {
return getNode(name); return getNode(name);
@ -1125,15 +1125,22 @@ public final class Node implements INode, Serializable {
* @return ... * @return ...
*/ */
protected Node getGroupbySubnode(String sid, boolean create) { protected Node getGroupbySubnode(String sid, boolean create) {
if (sid == null) {
throw new IllegalArgumentException("Can't create group by null");
}
if (state == TRANSIENT) {
throw new RuntimeException("Can't add grouped child on transient node. "+
"Make parent persistent before adding grouped nodes.");
}
loadNodes(); loadNodes();
if (subnodes == null) { if (subnodes == null) {
subnodes = new ExternalizableVector(); subnodes = new ExternalizableVector();
} }
NodeHandle ghandle = new NodeHandle(new SyntheticKey(getKey(), sid)); if (create || subnodes.contains(new NodeHandle(new SyntheticKey(getKey(), sid)))) {
if (subnodes.contains(ghandle) || create) {
try { try {
DbMapping groupbyMapping = dbmap.getGroupbyMapping(); DbMapping groupbyMapping = dbmap.getGroupbyMapping();
boolean relational = groupbyMapping.getSubnodeMapping().isRelational(); boolean relational = groupbyMapping.getSubnodeMapping().isRelational();
@ -1144,7 +1151,6 @@ public final class Node implements INode, Serializable {
// set "groupname" property to value of groupby field // set "groupname" property to value of groupby field
node.setString("groupname", sid); node.setString("groupname", sid);
node.setString("name", sid);
node.setDbMapping(groupbyMapping); node.setDbMapping(groupbyMapping);
@ -2183,8 +2189,11 @@ public final class Node implements INode, Serializable {
prop.setNodeValue(n); prop.setNodeValue(n);
if ((rel == null) || (rel.reftype == Relation.REFERENCE) || rel.virtual || if ((rel == null) ||
(rel.otherType == null) || !rel.otherType.isRelational()) { rel.reftype == Relation.REFERENCE ||
state == TRANSIENT ||
rel.otherType == null ||
!rel.otherType.isRelational()) {
// the node must be stored as explicit property // the node must be stored as explicit property
if (propMap == null) { if (propMap == null) {
propMap = new Hashtable(); propMap = new Hashtable();
@ -2401,7 +2410,7 @@ public final class Node implements INode, Serializable {
/** /**
* This method walks down node path to the first non-virtual node and return it. * This method walks down node path to the first non-virtual node and return it.
* limit max depth to 3, since there shouldn't be more then 2 layers of virtual nodes. * limit max depth to 5, since there shouldn't be more then 2 layers of virtual nodes.
*/ */
public Node getNonVirtualParent() { public Node getNonVirtualParent() {
Node node = this; Node node = this;