Merge from SEAMIST3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 10:44:42 +00:00
parent f50701a46c
commit 6cd69d17a2
4 changed files with 229 additions and 1 deletions

View File

@@ -862,7 +862,14 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl implements Ve
*/
protected NodeRef getVersionHistoryNodeRef(NodeRef nodeRef)
{
return this.dbNodeService.getChildByName(getRootNode(), CHILD_QNAME_VERSION_HISTORIES, nodeRef.getId());
if (nodeService.exists(nodeRef))
{
return this.dbNodeService.getChildByName(getRootNode(), CHILD_QNAME_VERSION_HISTORIES, (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NODE_UUID));
}
else
{
return this.dbNodeService.getChildByName(getRootNode(), CHILD_QNAME_VERSION_HISTORIES, nodeRef.getId());
}
}
/**