Repository: archiva Updated Branches: refs/heads/master 5d29c9ff1 -> 480825d72
copy collections to avoid ConcurrentModificationException Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/480825d7 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/480825d7 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/480825d7 Branch: refs/heads/master Commit: 480825d72b98d707b958ec53eb56cf6b1c6b2299 Parents: 5d29c9f Author: Olivier Lamy <[email protected]> Authored: Sun Nov 23 23:02:06 2014 +1100 Committer: Olivier Lamy <[email protected]> Committed: Sun Nov 23 23:02:06 2014 +1100 ---------------------------------------------------------------------- .../apache/archiva/proxy/DefaultRepositoryProxyConnectors.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/480825d7/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java index 0daa2d2..11eda06 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java @@ -134,7 +134,7 @@ public class DefaultRepositoryProxyConnectors @Inject private UrlFailureCache urlFailureCache; - private Map<String, List<ProxyConnector>> proxyConnectorMap = new HashMap<>(); + private Map<String, List<ProxyConnector>> proxyConnectorMap = new ConcurrentHashMap<>(); private Map<String, ProxyInfo> networkProxyMap = new ConcurrentHashMap<>(); @@ -457,7 +457,7 @@ public class DefaultRepositoryProxyConnectors boolean metadataNeedsUpdating = false; long originalTimestamp = getLastModified( localFile ); - List<ProxyConnector> connectors = getProxyConnectors( repository ); + List<ProxyConnector> connectors = new ArrayList<>( getProxyConnectors( repository ) ); for ( ProxyConnector connector : connectors ) { if ( connector.isDisabled() )
