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 
6309: Fixed AWC-1195 - Email space users.
   6311: AWC-1378
   6319: Fixed minor caching bug
   6320, 6326: Some fixes to the raw content download servlet available on /dr
   6324: Fix for AWC-1444 (workflow history issue)
   6325: Exceptions that occur in NavigatorPluginBean now correctly logged to the console


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 12:58:48 +00:00
parent 25d51202e0
commit 1f774fa8a7
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/model/permissionDefinitions.xml
View File

@@ -308,6 +308,7 @@
<!-- owner permissions. --> <!-- owner permissions. -->
<includePermissionGroup permissionGroup="Consumer" type="cm:cmobject"/> <includePermissionGroup permissionGroup="Consumer" type="cm:cmobject"/>
<includePermissionGroup permissionGroup="AddChildren" type="sys:base"/> <includePermissionGroup permissionGroup="AddChildren" type="sys:base"/>
<includePermissionGroup permissionGroup="ReadPermissions" type="sys:base" />
</permissionGroup> </permissionGroup>
<!-- An editor can read and write to the object; they can not create --> <!-- An editor can read and write to the object; they can not create -->
@@ -317,6 +318,7 @@
<includePermissionGroup type="cm:cmobject" permissionGroup="Consumer"/> <includePermissionGroup type="cm:cmobject" permissionGroup="Consumer"/>
<includePermissionGroup type="sys:base" permissionGroup="Write"/> <includePermissionGroup type="sys:base" permissionGroup="Write"/>
<includePermissionGroup type="cm:lockable" permissionGroup="CheckOut"/> <includePermissionGroup type="cm:lockable" permissionGroup="CheckOut"/>
<includePermissionGroup type="sys:base" permissionGroup="ReadPermissions"/>
</permissionGroup> </permissionGroup>
<!-- The Consumer permission allows read to everything by default. --> <!-- The Consumer permission allows read to everything by default. -->

3
source/java/org/alfresco/repo/content/AbstractRoutingContentStore.java
View File

@@ -334,11 +334,12 @@ public abstract class AbstractRoutingContentStore implements ContentStore
" Chose: " + store); " Chose: " + store);
} }
ContentWriter writer = store.getWriter(context); ContentWriter writer = store.getWriter(context);
String newContentUrl = writer.getContentUrl();
// Cache the store against the URL // Cache the store against the URL
storesCacheWriteLock.lock(); storesCacheWriteLock.lock();
try try
{ {
storesByContentUrl.put(contentUrl, store); storesByContentUrl.put(newContentUrl, store);
} }
finally finally
{ {