inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACE-2179, fix TestCMIS test, MultiTNodeServiceInterceptor throws an exception when it tries to intercept a deleted node.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@76129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2014-07-09 10:24:39 +00:00
parent 94003e3de5
commit 4d1141c27f
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/opencmis/ActivityPosterImpl.java
View File

@@ -207,7 +207,8 @@ public class ActivityPosterImpl implements ActivityPoster, InitializingBean
} }
} }
} }
postFileFolderActivity((isFolder ? ActivityType.FOLDER_ADDED : ActivityType.FILE_ADDED), path, parentNodeRef, nodeRef, siteId, name); FileInfo fileInfo = fileFolderService.getFileInfo(nodeRef);
postFileFolderActivity((isFolder ? ActivityType.FOLDER_ADDED : ActivityType.FILE_ADDED), path, parentNodeRef, nodeRef, siteId, name, fileInfo);
} }
} }
} }
@@ -229,7 +230,8 @@ public class ActivityPosterImpl implements ActivityPoster, InitializingBean
if (!isFolder) if (!isFolder)
{ {
postFileFolderActivity(ActivityType.FILE_UPDATED, null, null, nodeRef, siteId, fileName); FileInfo fileInfo = fileFolderService.getFileInfo(nodeRef);
postFileFolderActivity(ActivityType.FILE_UPDATED, null, null, nodeRef, siteId, fileName, fileInfo);
} }
} }
} }
@@ -245,7 +247,7 @@ public class ActivityPosterImpl implements ActivityPoster, InitializingBean
{ {
// post only for nodes within sites // post only for nodes within sites
postFileFolderActivity((activityInfo.isFolder() ? ActivityType.FOLDER_DELETED : ActivityType.FILE_DELETED), activityInfo.getParentPath(), activityInfo.getParentNodeRef(), activityInfo.getNodeRef(), postFileFolderActivity((activityInfo.isFolder() ? ActivityType.FOLDER_DELETED : ActivityType.FILE_DELETED), activityInfo.getParentPath(), activityInfo.getParentNodeRef(), activityInfo.getNodeRef(),
activityInfo.getSiteId(), activityInfo.getFileName()); activityInfo.getSiteId(), activityInfo.getFileName(), null);
} }
} }
@@ -288,10 +290,10 @@ public class ActivityPosterImpl implements ActivityPoster, InitializingBean
NodeRef parentNodeRef, NodeRef parentNodeRef,
NodeRef nodeRef, NodeRef nodeRef,
String siteId, String siteId,
String name) String name,
FileInfo fileInfo)
{ {
JSONObject json = createActivityJSON(getCurrentTenantDomain(), path, parentNodeRef, nodeRef, name); JSONObject json = createActivityJSON(getCurrentTenantDomain(), path, parentNodeRef, nodeRef, name);
FileInfo fileInfo = fileFolderService.getFileInfo(nodeRef);
activityService.postActivity( activityService.postActivity(
activityType, activityType,