inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2007-09-11 03:16:28 +00:00
parent 57554088ae
commit f443bd467d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/repo/avm/AVMServiceTest.java
View File

@@ -187,6 +187,7 @@ public class AVMServiceTest extends AVMServiceTestBase
finally finally
{ {
fService = oldService; fService = oldService;
fLockingService.removeStoreLocks("main");
fLockingService.removeWebProject("main"); fLockingService.removeWebProject("main");
authService.authenticate("admin", "admin".toCharArray()); authService.authenticate("admin", "admin".toCharArray());
} }

9
source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java
View File

@@ -546,16 +546,19 @@ public class AVMLockingServiceImpl implements AVMLockingService
{ {
return; return;
} }
List<String> toDelete = new ArrayList<String>();
for (Map.Entry<String, Attribute> entry: project.entrySet()) for (Map.Entry<String, Attribute> entry: project.entrySet())
{ {
AVMLock lock = new AVMLock(entry.getValue()); AVMLock lock = new AVMLock(entry.getValue());
if (lock.getStore().equals(store)) if (lock.getStore().equals(store))
{ {
project.remove(entry.getKey()); toDelete.add(entry.getKey());
} }
} }
keys.remove(2); for (String name : toDelete)
fAttributeService.setAttribute(keys, webProject, project); {
fAttributeService.removeAttribute(keys, name);
}
} }
/* (non-Javadoc) /* (non-Javadoc)