From 1f774fa8a79524898b3e59be9c73d14b6539f36b Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 10 Sep 2007 12:58:48 +0000
Subject: [PATCH] Merged V2.1 to HEAD    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
---
 config/alfresco/model/permissionDefinitions.xml                | 2 ++
 .../org/alfresco/repo/content/AbstractRoutingContentStore.java | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/model/permissionDefinitions.xml b/config/alfresco/model/permissionDefinitions.xml
index 2c47b10a21..af88e9bef0 100644
--- a/config/alfresco/model/permissionDefinitions.xml
+++ b/config/alfresco/model/permissionDefinitions.xml
@@ -308,6 +308,7 @@
           <!-- owner permissions.                                                      -->
           <includePermissionGroup permissionGroup="Consumer" type="cm:cmobject"/>
           <includePermissionGroup permissionGroup="AddChildren" type="sys:base"/>
+          <includePermissionGroup permissionGroup="ReadPermissions" type="sys:base" />
       </permissionGroup>
       
       <!-- 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="sys:base" permissionGroup="Write"/>
           <includePermissionGroup type="cm:lockable" permissionGroup="CheckOut"/>
+          <includePermissionGroup type="sys:base" permissionGroup="ReadPermissions"/>
       </permissionGroup>
       
       <!-- The Consumer permission allows read to everything by default.                  -->
diff --git a/source/java/org/alfresco/repo/content/AbstractRoutingContentStore.java b/source/java/org/alfresco/repo/content/AbstractRoutingContentStore.java
index b919633f74..fa86dbafaa 100644
--- a/source/java/org/alfresco/repo/content/AbstractRoutingContentStore.java
+++ b/source/java/org/alfresco/repo/content/AbstractRoutingContentStore.java
@@ -334,11 +334,12 @@ public abstract class AbstractRoutingContentStore implements ContentStore
                     "   Chose:  " + store);
         }
         ContentWriter writer = store.getWriter(context);
+        String newContentUrl = writer.getContentUrl();
         // Cache the store against the URL
         storesCacheWriteLock.lock();
         try
         {
-            storesByContentUrl.put(contentUrl, store);
+            storesByContentUrl.put(newContentUrl, store);
         }
         finally
         {