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

Fix object precedence in parent prototype registration: If an object

Browse source 
is already registered with a parent prototype's name, leave it as it is
and don't overwrite it since it has higher precedence than we have.
This commit is contained in:
hns 2003-12-16 13:14:07 +00:00
parent 144dee55cd
commit 026d6e1429
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/helma/framework/core/Prototype.java
View file

@ -176,14 +176,21 @@ public final class Prototype {
} }
/** /**
* Register an object as handler for all our parent prototypes. * Register an object as handler for all our parent prototypes, but only if
* a handler by that prototype name isn't registered yet. This is used to
* implement direct over indirect prototype precedence and child over parent
* precedence.
*/ */
public final void registerParents(Map handlers, Object obj) { public final void registerParents(Map handlers, Object obj) {
Prototype p = parent; Prototype p = parent;
while ((p != null) && !"hopobject".equalsIgnoreCase(p.getName())) { while ((p != null) && !"hopobject".equalsIgnoreCase(p.getName())) {
handlers.put(p.name, obj); Object old = handlers.put(p.name, obj);
// if an object was already registered by this name, put it back in again.
if (old != null) {
handlers.put(p.name, old);
}
p = p.parent; p = p.parent;
} }