From 923af7affdda803a5e5bc95cd768e736a1468f9b Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Fri, 23 Oct 2009 15:10:36 +0000
Subject: [PATCH] Merged V3.1 to HEAD     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
---
 .../org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java b/source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java
index 8d0361e056..9314b20d6a 100644
--- a/source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java
@@ -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)
                {