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

RM-880: Cannot upload file into RM site over FTP/NFS file protocols

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-09-26 05:55:51 +00:00
parent 77a9b6b8d2
commit 5b709487c9
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -362,7 +362,7 @@ public class RecordServiceImpl implements RecordService,
policyComponent.bindClassBehaviour( policyComponent.bindClassBehaviour(
NodeServicePolicies.OnRemoveAspectPolicy.QNAME, NodeServicePolicies.OnRemoveAspectPolicy.QNAME,
ContentModel.ASPECT_NO_CONTENT, ContentModel.ASPECT_NO_CONTENT,
new JavaBehaviour(this, "onRemoveAspect", NotificationFrequency.EVERY_EVENT)); new JavaBehaviour(this, "onRemoveAspect", NotificationFrequency.TRANSACTION_COMMIT));
} }
/** /**
@@ -452,24 +452,32 @@ public class RecordServiceImpl implements RecordService,
@Override @Override
public Void doWork() throws Exception public Void doWork() throws Exception
{ {
NodeRef nodeRef = childAssocRef.getChildRef(); onCreateChildAssociation.disable();
if (nodeService.exists(nodeRef) == true && try
nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) == false &&
nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) == false &&
nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY) == false)
{ {
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT) == true) NodeRef nodeRef = childAssocRef.getChildRef();
if (nodeService.exists(nodeRef) == true &&
nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) == false &&
nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) == false &&
nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY) == false)
{ {
// we need to postpone filling until the NO_CONTENT aspect is removed if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT) == true)
Set<NodeRef> pendingFilling = TransactionalResourceHelper.getSet("pendingFilling"); {
pendingFilling.add(nodeRef); // we need to postpone filling until the NO_CONTENT aspect is removed
} Set<NodeRef> pendingFilling = TransactionalResourceHelper.getSet("pendingFilling");
else pendingFilling.add(nodeRef);
{ }
// create and file the content as a record else
file(nodeRef); {
// create and file the content as a record
file(nodeRef);
}
} }
} }
finally
{
onCreateChildAssociation.enable();
}
return null; return null;
} }