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 V3.1 to HEAD

Browse Source 
17133: Merged V2.2 to V3.1
        17132: Fix ETWOONE-394, ETWOTWO-1016 - using regenerate renditions (3rd option) causes locks to remain
    also fix to use getAvmLockingService() 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-10-23 15:10:36 +00:00
parent 9aadc8f493
commit 923af7affd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java
View File

@@ -662,7 +662,7 @@ public class RegenerateRenditionsWizard
}
if (rr.getRendition() != null)
{
this.avmLockingService.removeLock(AVMUtil.getStoreId(rr.getRendition().getPath()),
getAvmLockingService().removeLock(AVMUtil.getStoreId(rr.getRendition().getPath()),
AVMUtil.getStoreRelativePath(rr.getRendition().getPath()));
}
}
@@ -679,6 +679,8 @@ public class RegenerateRenditionsWizard
{
r.regenerate();
result.add(r);
getAvmLockingService().removeLock(AVMUtil.getStoreId(r.getPath()), AVMUtil.getStoreRelativePath(r.getPath()));
}
catch (TemplateNotFoundException tnfe)
{