inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-6352: Merged V3.4 to HEAD

Browse Source 
24063: Merged V3.3-BUG-FIX to V3.4:
      24050: Merged V3.3 to V3.3-BUG-FIX
             23692: Merged DEV/TEMPORARY to V3.3
             23690: ALF-5576: Cannot write to CIFS when RM is installed.
                    Add missing security levels for ContentService.getStoreTotalSpace and ContentService.getStoreFreeSpace in RM.
                    Remove duplicate entry of ContentService.isTransformable in public-services-security-context.xml.
             23968: ALF-4846: Update rules are firing on inbound actions
      - Fixes duplicate issue ALF-5272: Update rule works incorrecly 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2011-01-06 13:52:42 +00:00
parent 244fbe1460
commit 4fd1a07713
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/rule/ruletrigger/OnPropertyUpdateRuleTrigger.java
View File

@@ -131,8 +131,10 @@ public class OnPropertyUpdateRuleTrigger extends RuleTriggerAbstractBase
Set<String> 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)
{