diff --git a/config/alfresco/public-services-security-context.xml b/config/alfresco/public-services-security-context.xml index cb24547b87..677646153f 100644 --- a/config/alfresco/public-services-security-context.xml +++ b/config/alfresco/public-services-security-context.xml @@ -449,7 +449,6 @@ org.alfresco.service.cmr.repository.ContentService.getStoreTotalSpace=ACL_ALLOW org.alfresco.service.cmr.repository.ContentService.getStoreFreeSpace=ACL_ALLOW - org.alfresco.service.cmr.repository.ContentService.isTransformable=ACL_ALLOW org.alfresco.service.cmr.repository.ContentService.getRawReader=ACL_METHOD.ROLE_ADMINISTRATOR org.alfresco.service.cmr.repository.ContentService.getReader=ACL_NODE.0.sys:base.ReadContent org.alfresco.service.cmr.repository.ContentService.getWriter=ACL_NODE.0.sys:base.WriteContent diff --git a/source/java/org/alfresco/repo/rule/ruletrigger/OnPropertyUpdateRuleTrigger.java b/source/java/org/alfresco/repo/rule/ruletrigger/OnPropertyUpdateRuleTrigger.java index 31042fcbc4..de62be9923 100644 --- a/source/java/org/alfresco/repo/rule/ruletrigger/OnPropertyUpdateRuleTrigger.java +++ b/source/java/org/alfresco/repo/rule/ruletrigger/OnPropertyUpdateRuleTrigger.java @@ -131,8 +131,10 @@ public class OnPropertyUpdateRuleTrigger extends RuleTriggerAbstractBase Set nodeRefSet = TransactionalResourceHelper.getSet(RULE_TRIGGER_NODESET); - // Only try and trigger the rules if a non protected propety has been modified - if (!nodeRefSet.contains(nodeRef.toString()) && havePropertiesBeenModified(nodeRef, before, after) == true) + // Only try and trigger the rules if a non protected property has been modified + if (!nodeRefSet.contains(nodeRef.toString()) && + before.size() != 0 && // ALF-4846: Do not trigger for newly created nodes + havePropertiesBeenModified(nodeRef, before, after) == true) { if (triggerParentRules == true) {