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

Fixed bug where a normal prototype could set its object prototypes to null

Browse source 
if hopobject directory didn't exist.
This commit is contained in:
hns 2001-04-19 13:14:35 +00:00
parent 27bca8cec1
commit ce51acc353
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,10 @@ public class Prototype {
} }
public void setPrototype (Prototype prototype) { public void setPrototype (Prototype prototype) {
// this is not allowed for the hopobject and global prototypes
if ("hopobject".equalsIgnoreCase (name) || "global".equalsIgnoreCase (name))
return;
Prototype old = this.prototype; Prototype old = this.prototype;
this.prototype = prototype; this.prototype = prototype;
@ -78,7 +82,13 @@ public class Prototype {
try { try {
RequestEvaluator reval = (RequestEvaluator) evals.next (); RequestEvaluator reval = (RequestEvaluator) evals.next ();
ObjectPrototype op = reval.getPrototype (getName()); ObjectPrototype op = reval.getPrototype (getName());
ObjectPrototype opp = prototype == null ? null : reval.getPrototype (prototype.getName ()); // use hopobject (node) as prototype even if prototype is null -
// this is the case if no hopobject directory exists
ObjectPrototype opp = prototype == null ?
reval.esNodePrototype : reval.getPrototype (prototype.getName ());
// don't think this is possible, but check anyway
if (opp == null)
opp = reval.esNodePrototype;
op.setPrototype (opp); op.setPrototype (opp);
} catch (Exception ignore) {} } catch (Exception ignore) {}
} }
@ -153,12 +163,11 @@ public class Prototype {
// 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)
if ("hopobject".equalsIgnoreCase (prototype.getName ()))
opp = reval.esNodePrototype;
else
opp = reval.getPrototype (prototype.getName ()); opp = reval.getPrototype (prototype.getName ());
} if (!"global".equalsIgnoreCase (name) &&
!"hopobject".equalsIgnoreCase (name) && opp == null)
opp = reval.esNodePrototype;
if ("user".equalsIgnoreCase (name)) { if ("user".equalsIgnoreCase (name)) {
op = reval.esUserPrototype; op = reval.esUserPrototype;