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

Merge V3.0 to HEAD

Browse Source 
11500: VS2 - fix ETHREEOH-450 and ALFCOM-1932 (and related dupes)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-11-03 13:55:54 +00:00
parent 107f267d77
commit 277a814c2a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/version/Version2ServiceImpl.java
View File

@@ -668,10 +668,11 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
if (logger.isTraceEnabled()) if (logger.isTraceEnabled())
{ {
logger.trace("getVersion: " + versionRef + " " + nodeProperties.keySet()); logger.trace("getVersion: " + versionRef + " nodeProperties=\n" + nodeProperties.keySet());
} }
// TODO consolidate with VersionUtil.convertFrozenToOriginalProps // TODO consolidate with VersionUtil.convertFrozenToOriginalProps
nodeProperties.remove(ContentModel.PROP_DESCRIPTION);
for (QName key : nodeProperties.keySet()) for (QName key : nodeProperties.keySet())
{ {
Serializable value = nodeProperties.get(key); Serializable value = nodeProperties.get(key);
@@ -708,6 +709,12 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
// Create and return the version object // Create and return the version object
NodeRef newNodeRef = new NodeRef(new StoreRef(Version2Model.STORE_PROTOCOL, Version2Model.STORE_ID), versionRef.getId()); NodeRef newNodeRef = new NodeRef(new StoreRef(Version2Model.STORE_PROTOCOL, Version2Model.STORE_ID), versionRef.getId());
Version result = new VersionImpl(versionProperties, newNodeRef); Version result = new VersionImpl(versionProperties, newNodeRef);
if (logger.isTraceEnabled())
{
logger.trace("getVersion: " + versionRef + " versionProperties=\n" + versionProperties.keySet());
}
// done // done
return result; return result;
} }