r10007 - helma/helma/trunk/src/helma/objectmodel/db

Author: hannes
Date: 2010-01-26 16:49:41 +0100 (Tue, 26 Jan 2010)
New Revision: 10007

Modified:
   helma/helma/trunk/src/helma/objectmodel/db/SubnodeList.java
Log:
Avoid NullPointerException in getLastSubnodeChange(). 
Preliminary fix for bug 697 <http://dev.helma.org/bugs/show_bug.cgi?id=697>

Details at http://dev.helma.org/trac/helma/changeset/10007

Modified: helma/helma/trunk/src/helma/objectmodel/db/SubnodeList.java
===================================================================
--- helma/helma/trunk/src/helma/objectmodel/db/SubnodeList.java	2010-01-26 15:34:34 UTC (rev 10006)
+++ helma/helma/trunk/src/helma/objectmodel/db/SubnodeList.java	2010-01-26 15:49:41 UTC (rev 10007)
@@ -164,7 +164,7 @@
         // 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();
     }