From 842d4fd92bb1d39a691464669e9d505e09787923 Mon Sep 17 00:00:00 2001 From: hns Date: Tue, 26 Jan 2010 15:49:41 +0000 Subject: [PATCH] Avoid NullPointerException in getLastSubnodeChange(). Preliminary fix for bug 697 --- src/helma/objectmodel/db/SubnodeList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helma/objectmodel/db/SubnodeList.java b/src/helma/objectmodel/db/SubnodeList.java index 803e5569..4cd90a9a 100644 --- a/src/helma/objectmodel/db/SubnodeList.java +++ b/src/helma/objectmodel/db/SubnodeList.java @@ -164,7 +164,7 @@ public class SubnodeList implements Serializable { // include dbmap.getLastTypeChange to also reload if the type mapping has changed. long checkSum = lastSubnodeChange + node.dbmap.getLastTypeChange(); Relation rel = getSubnodeRelation(); - return rel.aggressiveCaching ? + return rel == null || rel.aggressiveCaching ? checkSum : checkSum + rel.otherType.getLastDataChange(); }