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

Merged V3.2 to HEAD

Browse Source 
15151: IndexCheckServiceImplTest - build/test fix (ent-only)
    15152: Formatting-only
    15360: Fix for ETHREEOH-2567: Index check includes nodes in the unindexed version store - these should be excluded
    15630: Merged V3.1 to V3.2
        14424: Fix build/test - indexing of version store(s) is disabled
        14438: Fix index check (related to ETHREEOH-1832 - disable indexing of version2Store)
        14526: ETHREEOH-1759 - fix getVersion (affects IBM JVM => WebSphere)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-09-29 13:56:58 +00:00
parent aa4ad8b826
commit 4a7df596da
4 changed files with 137 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -667,7 +667,7 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
}
// TODO consolidate with VersionUtil.convertFrozenToOriginalProps
nodeProperties.remove(ContentModel.PROP_DESCRIPTION);
for (QName key : nodeProperties.keySet())
{
Serializable value = nodeProperties.get(key);
@@ -695,12 +695,21 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
}
else
{
// all other properties
versionProperties.put(keyName, value);
if (keyName.equals(Version.PROP_DESCRIPTION) ||
keyName.equals(VersionBaseModel.PROP_VERSION_LABEL) ||
keyName.equals(VersionBaseModel.PROP_VERSION_NUMBER))
{
// ignore reserved localname (including cm:description, cm:versionLabel)
}
else
{
// all other properties
versionProperties.put(keyName, value);
}
}
}
}
// Create and return the version object
NodeRef newNodeRef = new NodeRef(new StoreRef(Version2Model.STORE_PROTOCOL, Version2Model.STORE_ID), versionRef.getId());
Version result = new VersionImpl(versionProperties, newNodeRef);