mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
ALF-4596: ensure that versioned working copies are not migrated (2.1.7 incorrectly versions working copies)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -284,6 +284,37 @@ public class VersionMigrator implements ApplicationEventPublisherAware
|
|||||||
return newVersionRef;
|
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)
|
protected NodeRef v1GetVersionedNodeRef(NodeRef oldVersionHistoryRef)
|
||||||
{
|
{
|
||||||
NodeRef versionedNodeRef = null;
|
NodeRef versionedNodeRef = null;
|
||||||
@@ -326,9 +357,16 @@ public class VersionMigrator implements ApplicationEventPublisherAware
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void migrateVersion(NodeRef oldVHNodeRef, boolean deleteImmediately) throws Throwable
|
protected void migrateVersion(NodeRef oldVHNodeRef, boolean deleteImmediately) throws Throwable
|
||||||
|
{
|
||||||
|
if(v1CheckForVersionedWorkingCopy(oldVHNodeRef))
|
||||||
{
|
{
|
||||||
NodeRef versionedNodeRef = v1GetVersionedNodeRef(oldVHNodeRef);
|
NodeRef versionedNodeRef = v1GetVersionedNodeRef(oldVHNodeRef);
|
||||||
migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
|
migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.warn("Have found a versioned working copy node " + oldVHNodeRef + ", skipping");
|
||||||
|
}
|
||||||
|
|
||||||
if (deleteImmediately)
|
if (deleteImmediately)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user