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

Add missing calls to checkNode()

Browse source
This commit is contained in:
hns 2005-04-11 15:26:56 +00:00
parent 47e6955aa2
commit 2ab0f17678
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/helma/scripting/rhino/HopObject.java
View file

@ -192,6 +192,9 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
* @return the wrapped INode instance
*/
public INode getNode() {
if (node != null) {
checkNode();
}
return node;
}
@ -269,6 +272,8 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
Map param = RhinoCore.getSkinParam(paramobj);
checkNode();
if (skin != null) {
skin.render(reval, node, param);
}
@ -303,6 +308,8 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
Map param = RhinoCore.getSkinParam(paramobj);
checkNode();
if (skin != null) {
reval.res.pushStringBuffer();
skin.render(reval, node, param);
@ -357,6 +364,8 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
Object n = null;
checkNode();
if (id instanceof Number) {
n = node.getSubnodeAt(((Number) id).intValue());
} else if (id != null) {
@ -411,14 +420,14 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
return false;
}
checkNode();
if (id instanceof Number) {
if (!(value instanceof HopObject)) {
throw new EvaluatorException("Can only set HopObjects as child objects in HopObject.set()");
}
checkNode();
int idx = (((Number) id).intValue());
INode n = ((HopObject) value).getNode();
@ -650,6 +659,9 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
* @return the ID of the newly persisted HopObject or null if operation failed
*/
public Object jsFunction_persist() {
checkNode();
if (node instanceof helma.objectmodel.db.Node) {
((helma.objectmodel.db.Node) node).persist();
return node.getID();
@ -684,6 +696,9 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
* Check if node is contained in subnodes
*/
public int jsFunction_contains(Object obj) {
checkNode();
if ((node != null) && obj instanceof HopObject) {
checkNode();