From f443bd467db5da7e2c65547d360aa5b1cacbee02 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 11 Sep 2007 03:16:28 +0000
Subject: [PATCH] Merged V2.1 to HEAD    6606: Removed annoying warning message
 shown when developing custom client side validation handlers    6607: Fixed
 lock removal bug when deleting sandbox.    6608: Fix for AWC-601  -
 simple/advanced search user error message now "friendly" when lucene query
 parser exception occurs.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/avm/AVMServiceTest.java    | 1 +
 .../alfresco/repo/avm/locking/AVMLockingServiceImpl.java | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index 58f5413496..48ee2ca862 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -187,6 +187,7 @@ public class AVMServiceTest extends AVMServiceTestBase
         finally
         {
             fService = oldService;
+            fLockingService.removeStoreLocks("main");
             fLockingService.removeWebProject("main");
             authService.authenticate("admin", "admin".toCharArray());
         }
diff --git a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java
index e142bc50a6..2f4f91afbc 100644
--- a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java
+++ b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java
@@ -546,16 +546,19 @@ public class AVMLockingServiceImpl implements AVMLockingService
         {
             return;
         }
+        List<String> toDelete = new ArrayList<String>();
         for (Map.Entry<String, Attribute>  entry: project.entrySet())
         {
             AVMLock lock = new AVMLock(entry.getValue());
             if (lock.getStore().equals(store))
             {
-                project.remove(entry.getKey());
+                toDelete.add(entry.getKey());
             }
         }
-        keys.remove(2);
-        fAttributeService.setAttribute(keys, webProject, project);
+        for (String name : toDelete)
+        {
+            fAttributeService.removeAttribute(keys, name);            
+        }
     }
 
     /* (non-Javadoc)