You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/10/08 11:42:09 UTC
cxf git commit: [CXF-6629] Reverting to using HashMap instead of
WeakHashMap as it causes too many side-effects
Repository: cxf
Updated Branches:
refs/heads/master 7e8b16bf0 -> d8edf3161
[CXF-6629] Reverting to using HashMap instead of WeakHashMap as it causes too many side-effects
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d8edf316
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d8edf316
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d8edf316
Branch: refs/heads/master
Commit: d8edf3161f199d9c2fe3cb8314f6e98782bf22c5
Parents: 7e8b16b
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Oct 8 10:41:37 2015 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Oct 8 10:41:37 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8edf316/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
index 805bfa3..d73fe53 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
@@ -29,7 +29,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.WeakHashMap;
import java.util.logging.Logger;
import javax.ws.rs.core.Application;
@@ -209,7 +208,7 @@ public abstract class AbstractResourceInfo {
property = bus.getProperty(prop);
if (property == null && create) {
Map<Class<?>, Map<T, ThreadLocalProxy<?>>> map
- = Collections.synchronizedMap(new WeakHashMap<Class<?>, Map<T, ThreadLocalProxy<?>>>(2));
+ = Collections.synchronizedMap(new HashMap<Class<?>, Map<T, ThreadLocalProxy<?>>>(2));
bus.setProperty(prop, map);
property = map;
}
@@ -230,7 +229,7 @@ public abstract class AbstractResourceInfo {
Object property = bus.getProperty(CONSTRUCTOR_PROXY_MAP);
if (property == null) {
Map<Class<?>, Map<Class<?>, ThreadLocalProxy<?>>> map
- = Collections.synchronizedMap(new WeakHashMap<Class<?>, Map<Class<?>, ThreadLocalProxy<?>>>(2));
+ = Collections.synchronizedMap(new HashMap<Class<?>, Map<Class<?>, ThreadLocalProxy<?>>>(2));
bus.setProperty(CONSTRUCTOR_PROXY_MAP, map);
property = map;
}
@@ -380,7 +379,7 @@ public abstract class AbstractResourceInfo {
V proxy) {
Map<T, V> proxies = proxyMap.get(serviceClass);
if (proxies == null) {
- proxies = Collections.synchronizedMap(new WeakHashMap<T, V>());
+ proxies = Collections.synchronizedMap(new HashMap<T, V>());
proxyMap.put(serviceClass, proxies);
}
if (!proxies.containsKey(f)) {