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

Catch exceptions thrown while detaching from parent in Node.remove()

Browse source
This commit is contained in:
hns 2009-09-14 19:59:33 +00:00
parent b89989fa20
commit 64b778f11a
1 changed files with 8 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,10 +24,6 @@ import helma.objectmodel.INode;
import helma.objectmodel.IProperty; import helma.objectmodel.IProperty;
import helma.util.EmptyEnumeration; import helma.util.EmptyEnumeration;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.*; import java.util.*;
/** /**
@ -198,13 +194,6 @@ public final class Node implements INode {
this.propMap = propMap; this.propMap = propMap;
} }
/**
* used by Xml deserialization
*/
public synchronized void setSubnodes(SubnodeList subnodes) {
this.subnodes = subnodes;
}
/** /**
* Get the write lock on this node, throwing a ConcurrencyException if the * Get the write lock on this node, throwing a ConcurrencyException if the
* lock is already held by another thread. * lock is already held by another thread.
@ -810,7 +799,7 @@ public final class Node implements INode {
loadNodes(); loadNodes();
// check if this node has a group-by subnode-relation // check if this node has a group-by subnode-relation
INode groupbyNode = getGroupbySubnode(node, true); Node groupbyNode = getGroupbySubnode(node, true);
if (groupbyNode != null) { if (groupbyNode != null) {
groupbyNode.addNode(node); groupbyNode.addNode(node);
return node; return node;
@ -1228,7 +1217,12 @@ public final class Node implements INode {
public boolean remove() { public boolean remove() {
INode parent = getParent(); INode parent = getParent();
if (parent != null) { if (parent != null) {
parent.removeNode(this); try {
parent.removeNode(this);
} catch (Exception x) {
// couldn't remove from parent. Log and continue
getApp().logError("Couldn't remove node from parent: " + x);
}
} }
deepRemoveNode(); deepRemoveNode();
return true; return true;
@ -1480,8 +1474,7 @@ public final class Node implements INode {
} }
/** /**
* Retrieve an empty subnodelist. This empty List is an instance of the Class * Create an empty subnode list.
* used for this Nodes subnode-list
* @return List an empty List of the type used by this Node * @return List an empty List of the type used by this Node
*/ */
public SubnodeList createSubnodeList() { public SubnodeList createSubnodeList() {
@ -2571,31 +2564,6 @@ public final class Node implements INode {
System.err.println("properties: " + propMap); System.err.println("properties: " + propMap);
} }
/**
* This method get's called from the JavaScript environment
* (HopObject.updateSubnodes() or HopObject.collection.updateSubnodes()))
* The subnode-collection will be updated with a selectstatement getting all
* Nodes having a higher id than the highest id currently contained within
* this Node's subnoderelation. If this subnodelist has a special order
* all nodes will be loaded honoring this order.
* Example:
* order by somefield1 asc, somefieled2 desc
* gives a where-clausel like the following:
* (somefiled1 > theHighestKnownValue value and somefield2 < theLowestKnownValue)
* @return the number of loaded nodes within this collection update
*/
/* public int updateSubnodes () {
// TODO: what do we do if dbmap is null
if (dbmap == null) {
throw new RuntimeException (this + " doesn't have a DbMapping");
}
Relation subRel = dbmap.getSubnodeRelation();
synchronized (this) {
lastSubnodeFetch = getLastSubnodeChange(subRel);
return nmgr.updateSubnodeList(this, subRel);
}
} */
/** /**
* Get the application this node belongs to. * Get the application this node belongs to.
* @return the app we belong to * @return the app we belong to