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

TransferService:

Browse Source 
- Attempting to transfer a deleted node causes an exception. This fixes that.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2010-09-16 17:19:47 +00:00
parent 9565f9ea31
commit f076faacd4
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java
View File

@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.security.AccessPermission;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.transfer.TransferDefinition; import org.alfresco.service.cmr.transfer.TransferDefinition;
import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferException;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.namespace.RegexQNamePattern;
@@ -70,7 +71,22 @@ public class TransferManifestNodeFactoryImpl implements TransferManifestNodeFact
/** /**
* Work out whether this is a deleted node or not * Work out whether this is a deleted node or not
*/ */
if(nodeRef.getStoreRef().equals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE) || status.isDeleted()) if (status.isDeleted())
{
//This node used to exist but doesn't any more. We can't discover anything about its original parentage
//so we will create a dummy record that contains the correct noderef but dummy parent association and
//parent path. This will keep the target side happy, and will result in the node being deleted
//if a node with the same noderef exists on the target.
TransferManifestDeletedNode deletedNode = new TransferManifestDeletedNode();
deletedNode.setNodeRef(nodeRef);
ChildAssociationRef dummyPrimaryParent = new ChildAssociationRef(ContentModel.ASSOC_CONTAINS,
nodeRef, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "dummy"),
nodeRef, true, -1);
deletedNode.setPrimaryParentAssoc(dummyPrimaryParent);
deletedNode.setParentPath(new Path());
return deletedNode;
}
else if(nodeRef.getStoreRef().equals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE))
{ {
if(nodeService.hasAspect(nodeRef, ContentModel.ASPECT_ARCHIVED)) if(nodeService.hasAspect(nodeRef, ContentModel.ASPECT_ARCHIVED))
{ {