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

Merged BRANCHES/V3.4 to HEAD (to fix ALF-5837)

Browse Source 
23478: ALF-5303: Upload new version fails when file uploaded to sub-folder and parent folder has rule for update

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-12-06 15:36:56 +00:00
parent da8935725d
commit d317abfa36
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/repo/rule/RuleServiceImpl.java
View File

@@ -1044,17 +1044,24 @@ public class RuleServiceImpl
* @see org.alfresco.repo.rule.RuleService#executePendingRules()
*/
public void executePendingRules()
{
if (logger.isDebugEnabled() == true)
{
logger.debug("Creating the executed rules list");
}
{
if (AlfrescoTransactionSupport.getResource(KEY_RULES_EXECUTED) == null)
{
if (logger.isDebugEnabled() == true)
{
logger.debug("Creating the executed rules list");
}
AlfrescoTransactionSupport.bindResource(KEY_RULES_EXECUTED, new HashSet<ExecutedRuleData>());
}
List<PendingRuleData> executeAtEndRules = new ArrayList<PendingRuleData>();
else
{
if (logger.isDebugEnabled() == true)
{
logger.debug("Executed rules list already exists");
}
}
List<PendingRuleData> executeAtEndRules = new ArrayList<PendingRuleData>();
executePendingRulesImpl(executeAtEndRules);
for (PendingRuleData data : executeAtEndRules)
{