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

Fixed a bug where object prototypes were not created with proper parent prototypes

Browse source
This commit is contained in:
hns 2001-08-10 18:10:23 +00:00
parent 4e50a34189
commit 29e9f745e1
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,8 @@ public class Prototype {
if (opp == null) if (opp == null)
opp = reval.esNodePrototype; opp = reval.esNodePrototype;
op.setPrototype (opp); op.setPrototype (opp);
} catch (Exception ignore) {} } catch (Exception ignore) {
}
} }
} }
} }
@ -124,15 +125,25 @@ public class Prototype {
public void initRequestEvaluator (RequestEvaluator reval) { public void initRequestEvaluator (RequestEvaluator reval) {
// see if we already registered with this evaluator
if (reval.getPrototype (name) != null)
return;
ObjectPrototype op = null; ObjectPrototype op = null;
// get the prototype's prototype if possible and necessary // get the prototype's prototype if possible and necessary
ObjectPrototype opp = null; ObjectPrototype opp = null;
if (prototype != null) if (prototype != null) {
// see if parent prototype is already registered. if not, register it
opp = reval.getPrototype (prototype.getName ()); opp = reval.getPrototype (prototype.getName ());
if (!"global".equalsIgnoreCase (name) && if (opp == null) {
!"hopobject".equalsIgnoreCase (name) && opp == null) prototype.initRequestEvaluator (reval);
opp = reval.getPrototype (prototype.getName ());
}
}
if (!"global".equalsIgnoreCase (name) && !"hopobject".equalsIgnoreCase (name) && opp == null) {
opp = reval.esNodePrototype; opp = reval.esNodePrototype;
}
if ("user".equalsIgnoreCase (name)) { if ("user".equalsIgnoreCase (name)) {
op = reval.esUserPrototype; op = reval.esUserPrototype;