From 8e26f5aad54db4037e541eb90cd2c3a55538fc93 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 29 Aug 2019 21:35:00 +1000 Subject: [PATCH] Addition tests for records, fixed up a couple of issues in the query method as a result. --- .../query/RecordsManagementQueryDAOImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java index 5503f5b86c..50a6675ccd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java @@ -197,7 +197,7 @@ public class RecordsManagementQueryDAOImpl implements RecordsManagementQueryDAO, StringBuilder logMessage = null; NodeRef nodeRefToAdd; - if (nodeDAO.exists(nodeId)) + if (nodeId != null && nodeDAO.exists(nodeId)) { if (logger.isDebugEnabled()) { @@ -206,7 +206,7 @@ public class RecordsManagementQueryDAOImpl implements RecordsManagementQueryDAO, // if the referencing node is a version2Store reference to the content url, add the uuid for the version 2 frozen node ref NodeRef version2FrozenNodeRef = (NodeRef) nodeDAO.getNodeProperty(nodeId, Version2Model.PROP_QNAME_FROZEN_NODE_REF); - if (version2FrozenNodeRef != null) + if (version2FrozenNodeRef != null && nodeDAO.exists(version2FrozenNodeRef)) { nodeRefToAdd = version2FrozenNodeRef;