inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-2873: Browsing version history properties fails when version destroyed

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@120061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2015-12-10 22:09:07 +00:00
parent 8dabd2f2ba
commit c57c0ed25f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionNodeServiceImpl.java
View File

@@ -62,6 +62,7 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
/** /**
* @see org.alfresco.repo.version.Node2ServiceImpl#getProperties(org.alfresco.service.cmr.repository.NodeRef) * @see org.alfresco.repo.version.Node2ServiceImpl#getProperties(org.alfresco.service.cmr.repository.NodeRef)
*/ */
@SuppressWarnings("unchecked")
@Override @Override
public Map<QName, Serializable> getProperties(NodeRef nodeRef) throws InvalidNodeRefException public Map<QName, Serializable> getProperties(NodeRef nodeRef) throws InvalidNodeRefException
{ {
@@ -71,10 +72,17 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
if (dbNodeService.hasAspect(converted, ASPECT_RECORDED_VERSION)) if (dbNodeService.hasAspect(converted, ASPECT_RECORDED_VERSION))
{ {
NodeRef record = (NodeRef)dbNodeService.getProperty(converted, PROP_RECORD_NODE_REF); NodeRef record = (NodeRef)dbNodeService.getProperty(converted, PROP_RECORD_NODE_REF);
if (record != null && dbNodeService.exists(record))
{
Map<QName, Serializable> properties = dbNodeService.getProperties(record); Map<QName, Serializable> properties = dbNodeService.getProperties(record);
return processProperties(converted, properties); return processProperties(converted, properties);
} }
else else
{
return (Map<QName, Serializable>)Collections.EMPTY_MAP;
}
}
else
{ {
return super.getProperties(nodeRef); return super.getProperties(nodeRef);
} }
@@ -192,7 +200,7 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
if (dbNodeService.hasAspect(converted, ASPECT_RECORDED_VERSION)) if (dbNodeService.hasAspect(converted, ASPECT_RECORDED_VERSION))
{ {
NodeRef record = (NodeRef)dbNodeService.getProperty(converted, PROP_RECORD_NODE_REF); NodeRef record = (NodeRef)dbNodeService.getProperty(converted, PROP_RECORD_NODE_REF);
if (dbNodeService.exists(record)) if (record != null && dbNodeService.exists(record))
{ {
Set<QName> aspects = dbNodeService.getAspects(record); Set<QName> aspects = dbNodeService.getAspects(record);
return processAspects(aspects); return processAspects(aspects);