You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/11/24 01:14:40 UTC
archiva git commit: make it clear it is ConcurrentMap so no need of
synchronized block
Repository: archiva
Updated Branches:
refs/heads/master 1f42a01fb -> 54b223670
make it clear it is ConcurrentMap so no need of synchronized block
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/54b22367
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/54b22367
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/54b22367
Branch: refs/heads/master
Commit: 54b22367001d20483c85358d7ca0c1eededbc647
Parents: 1f42a01
Author: Olivier Lamy <ol...@apache.org>
Authored: Mon Nov 24 11:14:11 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Mon Nov 24 11:14:32 2014 +1100
----------------------------------------------------------------------
.../proxy/DefaultRepositoryProxyConnectors.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/54b22367/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 11eda06..6862149 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
@@ -97,6 +97,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
/**
* DefaultRepositoryProxyConnectors
@@ -134,9 +135,9 @@ public class DefaultRepositoryProxyConnectors
@Inject
private UrlFailureCache urlFailureCache;
- private Map<String, List<ProxyConnector>> proxyConnectorMap = new ConcurrentHashMap<>();
+ private ConcurrentMap<String, List<ProxyConnector>> proxyConnectorMap = new ConcurrentHashMap<>();
- private Map<String, ProxyInfo> networkProxyMap = new ConcurrentHashMap<>();
+ private ConcurrentMap<String, ProxyInfo> networkProxyMap = new ConcurrentHashMap<>();
@Inject
private WagonFactory wagonFactory;
@@ -1253,17 +1254,16 @@ public class DefaultRepositoryProxyConnectors
@Override
public List<ProxyConnector> getProxyConnectors( ManagedRepositoryContent repository )
{
- synchronized ( this.proxyConnectorMap )
- {
- List<ProxyConnector> ret = this.proxyConnectorMap.get( repository.getId() );
- if ( ret == null )
- {
- return Collections.emptyList();
- }
- Collections.sort( ret, ProxyConnectorOrderComparator.getInstance() );
- return ret;
+ List<ProxyConnector> ret = this.proxyConnectorMap.get( repository.getId() );
+ if ( ret == null )
+ {
+ return Collections.emptyList();
}
+
+ Collections.sort( ret, ProxyConnectorOrderComparator.getInstance() );
+ return ret;
+
}
@Override