inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
98723: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98580: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98457: Merged NESS/4.2.N-2015-02-10 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            98405: MNT-13502 : Possible concurrency issue in StoreRedirectorProxyFactory
               - Used unmodifiable collection for redirectProtocolBindings and redirectedStoreBindings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-06 08:06:02 +00:00
parent e99737fc8b
commit bcd9bfd7bc
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java
View File

@@ -101,7 +101,15 @@ public class StoreRedirectorProxyFactory<I> implements FactoryBean, Initializing
*/ */
public void setRedirectedProtocolBindings(Map<String, I> protocolBindings) public void setRedirectedProtocolBindings(Map<String, I> protocolBindings)
{ {
this.redirectedProtocolBindings = protocolBindings; if (protocolBindings != null)
{
this.redirectedProtocolBindings = Collections.unmodifiableMap(protocolBindings);
}
else
{
logger.warn("Null map injected");
this.redirectedProtocolBindings = protocolBindings;
}
} }
/** /**
@@ -112,14 +120,15 @@ public class StoreRedirectorProxyFactory<I> implements FactoryBean, Initializing
*/ */
public void setRedirectedStoreBindings(Map<String, I> storeBindings) public void setRedirectedStoreBindings(Map<String, I> storeBindings)
{ {
redirectedStoreBindings = new HashMap<StoreRef, I>(storeBindings.size());
for(String ref : storeBindings.keySet()) Map<StoreRef, I> redirectedStoreBindingsMap = new HashMap<StoreRef, I>(storeBindings.size());
for (String ref : storeBindings.keySet())
{ {
redirectedStoreBindings.put(new StoreRef(ref), storeBindings.get(ref)); redirectedStoreBindingsMap.put(new StoreRef(ref), storeBindings.get(ref));
} }
redirectedStoreBindings = Collections.unmodifiableMap(redirectedStoreBindingsMap);
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/ */