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

Fix bug where aggressive cachemode influences caching behaviour of complex reference.

Browse source
This commit is contained in:
hns 2009-09-09 23:19:45 +00:00
parent 04c809ad58
commit c50d8b9a3b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/helma/objectmodel/db/NodeManager.java
View file

@ -219,7 +219,7 @@ public final class NodeManager {
// See if Transactor has already come across this node
Node node = tx.getCleanNode(key);
if ((node != null) && (node.getState() != Node.INVALID)) {
if (node != null && node.getState() != Node.INVALID) {
// we used to refresh the node in the main cache here to avoid the primary key
// entry being flushed from cache before the secondary one
// (risking duplicate nodes in cache) but we don't need to since we fetched
@ -233,10 +233,11 @@ public final class NodeManager {
// check if we can use the cached node without further checks.
// we need further checks for subnodes fetched by name if the subnodes were changed.
if ((node != null) && (node.getState() != Node.INVALID)) {
if (node != null && node.getState() != Node.INVALID) {
// check if node is null node (cached null)
if (node.isNullNode()) {
if (node.created != home.getLastSubnodeChange()) {
// do not check reference nodes against child collection
if (rel.isComplexReference() || node.created != home.getLastSubnodeChange()) {
node = null; // cached null not valid anymore
}
} else if (!rel.virtual) {
@ -256,7 +257,7 @@ public final class NodeManager {
}
}
if ((node == null) || (node.getState() == Node.INVALID)) {
if (node == null || node.getState() == Node.INVALID) {
// The requested node isn't in the shared cache.
// Synchronize with key to make sure only one version is fetched
// from the database.