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

Fix patch to prevent exception that was preventing upgrade from previous schema.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@67101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-04-10 04:28:30 +00:00
parent 73b678c4c7
commit c69df9f8f0
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22GhostOnDestroyDispositionActionPatch.java
View File

@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
@@ -35,6 +36,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
/** /**
* Sets the ghost on destroy property for existing destroy disposition actions * Sets the ghost on destroy property for existing destroy disposition actions
@@ -128,16 +130,19 @@ public class RMv22GhostOnDestroyDispositionActionPatch extends AbstractModulePat
*/ */
private void getDispositionSchedules(NodeRef nodeRef, Set<DispositionSchedule> dispositionSchedules) private void getDispositionSchedules(NodeRef nodeRef, Set<DispositionSchedule> dispositionSchedules)
{ {
DispositionSchedule dispositionSchedule = this.dispositionService.getDispositionSchedule(nodeRef); if (filePlanService.isRecordCategory(nodeRef) == true)
if (dispositionSchedule != null)
{ {
dispositionSchedules.add(dispositionSchedule); DispositionSchedule dispositionSchedule = this.dispositionService.getDispositionSchedule(nodeRef);
} if (dispositionSchedule != null)
{
dispositionSchedules.add(dispositionSchedule);
}
List<ChildAssociationRef> children = nodeService.getChildAssocs(nodeRef); List<ChildAssociationRef> children = nodeService.getChildAssocs(nodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef childAssoc : children) for (ChildAssociationRef childAssoc : children)
{ {
getDispositionSchedules(childAssoc.getChildRef(), dispositionSchedules); getDispositionSchedules(childAssoc.getChildRef(), dispositionSchedules);
}
} }
} }