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

ALF-4596: ensure that versioned working copies are not migrated (2.1.7 incorrectly versions working copies)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2010-09-14 09:01:06 +00:00
parent f3a0026b69
commit 6836fd1344
1 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/java/org/alfresco/repo/version/VersionMigrator.java
View File

@@ -283,6 +283,37 @@ public class VersionMigrator implements ApplicationEventPublisherAware
return newVersionRef;
}
/**
* Check whether the V1 history represented by oldVersionHistoryRef represents
* a versioned working copy node (Alfresco V2.1.7 can create these)
*
* @param oldVersionHistoryRef
* @return
*/
protected boolean v1CheckForVersionedWorkingCopy(NodeRef oldVersionHistoryRef)
{
boolean valid = true;
// Get versioned nodeRef from one of the versions - note: assumes all versions refer to the same versioned nodeRef
Collection<ChildAssociationRef> versions = dbNodeService.getChildAssocs(oldVersionHistoryRef);
if (versions.size() > 0)
{
Iterator<ChildAssociationRef> itr = versions.iterator();
ChildAssociationRef childAssocRef = itr.next();
NodeRef versionRef = childAssocRef.getChildRef();
Version version = version1Service.getVersion(versionRef);
@SuppressWarnings("unchecked")
List<QName> frozenAspects = (List<QName>)dbNodeService.getProperty(versionRef, VersionModel.PROP_QNAME_FROZEN_ASPECTS);
if(frozenAspects.contains(ContentModel.ASPECT_WORKING_COPY) && frozenAspects.contains(ContentModel.ASPECT_VERSIONABLE))
{
valid = false;
}
}
return valid;
}
protected NodeRef v1GetVersionedNodeRef(NodeRef oldVersionHistoryRef)
{
@@ -327,8 +358,15 @@ public class VersionMigrator implements ApplicationEventPublisherAware
protected void migrateVersion(NodeRef oldVHNodeRef, boolean deleteImmediately) throws Throwable
{
NodeRef versionedNodeRef = v1GetVersionedNodeRef(oldVHNodeRef);
migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
if(v1CheckForVersionedWorkingCopy(oldVHNodeRef))
{
NodeRef versionedNodeRef = v1GetVersionedNodeRef(oldVHNodeRef);
migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
}
else
{
logger.warn("Have found a versioned working copy node " + oldVHNodeRef + ", skipping");
}
if (deleteImmediately)
{