r10008 - helma/helma/trunk/src/helma/objectmodel/db

[email protected] Tue, 26 Jan 2010 16:52:48 +0100 (CET)
Newsgroups gmane.comp.java.helma.cvs
Message-ID <20100126155248.8840A3D0E2@mia>
Author: hannes
Date: 2010-01-26 16:52:48 +0100 (Tue, 26 Jan 2010)
New Revision: 10008

Modified:
   helma/helma/trunk/src/helma/objectmodel/db/SubnodeList.java
Log:
More null pointer guards.

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

Modified: helma/helma/trunk/src/helma/objectmodel/db/SubnodeList.java
===================================================================
--- helma/helma/trunk/src/helma/objectmodel/db/SubnodeList.java	2010-01-26 15:49:41 UTC (rev 10007)
+++ helma/helma/trunk/src/helma/objectmodel/db/SubnodeList.java	2010-01-26 15:52:48 UTC (rev 10008)
@@ -129,7 +129,7 @@
         long lastChange = getLastSubnodeChange();
         if (lastChange != lastSubnodeFetch) {
             Relation rel = getSubnodeRelation();
-            if (rel.aggressiveLoading && rel.groupby == null) {
+            if (rel != null && rel.aggressiveLoading && rel.groupby == null) {
                 list = node.nmgr.getNodes(node, rel);
             } else {
                 list = node.nmgr.getNodeIDs(node, rel);