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

fix bug where node was registered with wrong key.

Browse source 
check for storage compatibility instead of equality in
setNode().
This commit is contained in:
hns 2001-08-30 22:24:38 +00:00
parent 244e7ba779
commit b931f57e42
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/helma/objectmodel/db/Node.java
View file

@ -1550,7 +1550,7 @@ public final class Node implements INode, Serializable {
if (nmap != null && nmap != value.getDbMapping()) { if (nmap != null && nmap != value.getDbMapping()) {
if (value.getDbMapping () == null) if (value.getDbMapping () == null)
value.setDbMapping (nmap); value.setDbMapping (nmap);
else else if (!nmap.isStorageCompatible (value.getDbMapping ()))
throw new RuntimeException ("Can't set "+propname+" to object with prototype "+value.getPrototype()+", was expecting "+nmap.getTypeName()); throw new RuntimeException ("Can't set "+propname+" to object with prototype "+value.getPrototype()+", was expecting "+nmap.getTypeName());
} }
@ -1610,12 +1610,14 @@ public final class Node implements INode, Serializable {
prop.nhandle = new NodeHandle (new DbKey (n.getDbMapping (), kval, rel.getRemoteField ())); prop.nhandle = new NodeHandle (new DbKey (n.getDbMapping (), kval, rel.getRemoteField ()));
} */ } */
// don't check node in transactor cache -- this is done anyway when the node becomes persistent. // don't check node in transactor cache if node is transient -
// this is done anyway when the node becomes persistent.
if (n.state != TRANSIENT) { if (n.state != TRANSIENT) {
// check node in with transactor cache // check node in with transactor cache
String nID = n.getID(); String nID = n.getID();
DbMapping dbm = n.getDbMapping ();
Transactor tx = (Transactor) Thread.currentThread (); Transactor tx = (Transactor) Thread.currentThread ();
tx.visitCleanNode (new DbKey (nmap, nID), n); tx.visitCleanNode (new DbKey (dbm, nID), n);
// if the field is not the primary key of the property, also register it // if the field is not the primary key of the property, also register it
if (rel != null && rel.accessor != null && state != TRANSIENT) { if (rel != null && rel.accessor != null && state != TRANSIENT) {
Key secKey = new SyntheticKey (getKey (), propname); Key secKey = new SyntheticKey (getKey (), propname);