Merged BRANCHES/DEV/BELARUS/HEAD-ENH-1107 to HEAD:

31986: ENH-1107 : Auditable fix as discussed with Derek, needed when connecting to alfreco sharepoint protocol via Office 2008 for Mac


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32060 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-11-17 14:24:48 +00:00
parent 9d1b2cbf9c
commit 1cd461a4cb
2 changed files with 97 additions and 1 deletions

View File

@@ -1575,7 +1575,15 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
{
auditableProps = new AuditablePropertiesEntity(auditableProps);
}
boolean updateAuditableProperties = auditableProps.setAuditValues(null, null, false, 1000L);
long modifiedDateToleranceMs = 1000L;
if (nodeUpdate.isUpdateTransaction())
{
// allow update cm:modified property for new transaction
modifiedDateToleranceMs = 0L;
}
boolean updateAuditableProperties = auditableProps.setAuditValues(null, null, false, modifiedDateToleranceMs);
nodeUpdate.setAuditableProperties(auditableProps);
nodeUpdate.setUpdateAuditableProperties(updateAuditableProperties);
}