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

* Simplify static HopObject constructor getter code.

Browse source 
* Set node reference to an empty transient node in checkNode()
   for deleted/invalid HopObjects.
This commit is contained in:
hns 2005-11-17 14:22:11 +00:00
parent ed6712719c
commit 527a1bc846
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,14 +37,11 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
static Method hopObjCtor;
static {
Method[] methods = HopObject.class.getMethods();
for (int i = 0; i < methods.length; i++) {
if ("jsConstructor".equals(methods[i].getName())) {
hopObjCtor = methods[i];
break;
}
try {
hopObjCtor = HopObject.class.getMethod("jsConstructor", new Class[] {
Context.class, Object[].class, Function.class, Boolean.TYPE });
} catch (NoSuchMethodException e) {
throw new RuntimeException("Error getting HopObject.jsConstructor()");
}
}
@ -221,6 +218,12 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
if (node instanceof helma.objectmodel.db.Node) {
NodeHandle handle = ((helma.objectmodel.db.Node) node).getHandle();
node = handle.getNode(core.app.getWrappedNodeManager());
if (node == null) {
// we probably have a deleted node. Replace with empty transient node
// to avoid throwing an exception.
node = new helma.objectmodel.TransientNode();
// throw new RuntimeException("Tried to access invalid/removed node " + handle + ".");
}
}
}
}
@ -827,7 +830,7 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
checkNode();
// Property names starting with an underscore is interpreted
// Property names starting with an underscore is interpreted
// as internal properties
if (name.charAt(0) == '_') {
Object value = getInternalProperty(name);