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

Revert changes and removed cache check.

Browse Source
This commit is contained in:
roxana
2016-11-04 17:08:09 +02:00
parent cb11d527d4
commit 373439822c
1 changed files with 30 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java
View File

@@ -21,7 +21,6 @@ package org.alfresco.module.org_alfresco_module_rm.model.behaviour;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -511,68 +510,45 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel
*/ */
private void updateDispositionActionProperties(NodeRef record, NodeRef dispositionAction) private void updateDispositionActionProperties(NodeRef record, NodeRef dispositionAction)
{ {
Date recordSearchDispositionActionAsOf = (Date)nodeService.getProperty(record, PROP_RS_DISPOSITION_ACTION_AS_OF); Map<QName, Serializable> props = nodeService.getProperties(record);
DispositionAction da = new DispositionActionImpl(recordsManagementServiceRegistry, dispositionAction); DispositionAction da = new DispositionActionImpl(recordsManagementServiceRegistry, dispositionAction);
// update disposition action as of if it changed
// @since 2.3.1 props.put(PROP_RS_DISPOSITION_ACTION_NAME, da.getName());
// @see https://issues.alfresco.com/jira/browse/RM-4313 props.put(PROP_RS_DISPOSITION_ACTION_AS_OF, da.getAsOfDate());
if (!methodCached("updateDispositionActionProperties", record) props.put(PROP_RS_DISPOSITION_EVENTS_ELIGIBLE, nodeService.getProperty(dispositionAction, PROP_DISPOSITION_EVENTS_ELIGIBLE));
|| isDispositionActionAsOfChanged(recordSearchDispositionActionAsOf, da.getAsOfDate()))
DispositionActionDefinition daDefinition = da.getDispositionActionDefinition();
if (daDefinition != null)
{ {
Map<QName, Serializable> props = nodeService.getProperties(record); Period period = daDefinition.getPeriod();
if (period != null)
props.put(PROP_RS_DISPOSITION_ACTION_NAME, da.getName());
props.put(PROP_RS_DISPOSITION_ACTION_AS_OF, da.getAsOfDate());
props.put(PROP_RS_DISPOSITION_EVENTS_ELIGIBLE, nodeService.getProperty(dispositionAction, PROP_DISPOSITION_EVENTS_ELIGIBLE));
DispositionActionDefinition daDefinition = da.getDispositionActionDefinition();
if (daDefinition != null)
{ {
Period period = daDefinition.getPeriod(); props.put(PROP_RS_DISPOSITION_PERIOD, period.getPeriodType());
if (period != null) props.put(PROP_RS_DISPOSITION_PERIOD_EXPRESSION, period.getExpression());
{
props.put(PROP_RS_DISPOSITION_PERIOD, period.getPeriodType());
props.put(PROP_RS_DISPOSITION_PERIOD_EXPRESSION, period.getExpression());
}
else
{
props.put(PROP_RS_DISPOSITION_PERIOD, null);
props.put(PROP_RS_DISPOSITION_PERIOD_EXPRESSION, null);
}
} }
else
nodeService.setProperties(record, props);
if (logger.isDebugEnabled())
{ {
logger.debug("Set rma:recordSearchDispositionActionName for node " + record + " to: " + props.put(PROP_RS_DISPOSITION_PERIOD, null);
props.get(PROP_RS_DISPOSITION_ACTION_NAME)); props.put(PROP_RS_DISPOSITION_PERIOD_EXPRESSION, null);
logger.debug("Set rma:recordSearchDispositionActionAsOf for node " + record + " to: " +
props.get(PROP_RS_DISPOSITION_ACTION_AS_OF));
logger.debug("Set rma:recordSearchDispositionEventsEligible for node " + record + " to: " +
props.get(PROP_RS_DISPOSITION_EVENTS_ELIGIBLE));
logger.debug("Set rma:recordSearchDispositionPeriod for node " + record + " to: " +
props.get(PROP_RS_DISPOSITION_PERIOD));
logger.debug("Set rma:recordSearchDispositionPeriodExpression for node " + record + " to: " +
props.get(PROP_RS_DISPOSITION_PERIOD_EXPRESSION));
} }
} }
}
nodeService.setProperties(record, props);
/**
* Check if recordSearchDispositionActionAsOf property has been changed if (logger.isDebugEnabled())
*
* @param currentDate current as of date value
* @param updatedDate new as of date value
* @return true if the as of date has been changed
*/
private boolean isDispositionActionAsOfChanged(Date currentDate, Date updatedDate)
{
if ((currentDate != null && updatedDate == null) || (currentDate == null && updatedDate != null))
{ {
return true; logger.debug("Set rma:recordSearchDispositionActionName for node " + record + " to: " +
props.get(PROP_RS_DISPOSITION_ACTION_NAME));
logger.debug("Set rma:recordSearchDispositionActionAsOf for node " + record + " to: " +
props.get(PROP_RS_DISPOSITION_ACTION_AS_OF));
logger.debug("Set rma:recordSearchDispositionEventsEligible for node " + record + " to: " +
props.get(PROP_RS_DISPOSITION_EVENTS_ELIGIBLE));
logger.debug("Set rma:recordSearchDispositionPeriod for node " + record + " to: " +
props.get(PROP_RS_DISPOSITION_PERIOD));
logger.debug("Set rma:recordSearchDispositionPeriodExpression for node " + record + " to: " +
props.get(PROP_RS_DISPOSITION_PERIOD_EXPRESSION));
} }
return currentDate.compareTo(updatedDate) != 0;
} }
/** /**