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 2014/06/26 23:01:15 UTC
git commit: Replacing a strong map of jaxrs context proxies with a
weak hash map
Repository: cxf
Updated Branches:
refs/heads/master bf8247f86 -> d012b94b9
Replacing a strong map of jaxrs context proxies with a weak hash map
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d012b94b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d012b94b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d012b94b
Branch: refs/heads/master
Commit: d012b94b94686dc98762b919a60b765be5b0b3df
Parents: bf8247f
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Thu Jun 26 22:00:56 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Thu Jun 26 22:00:56 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d012b94b/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 2770ef2..13113dd 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
@@ -27,7 +27,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.WeakHashMap;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Context;
@@ -178,7 +178,7 @@ public abstract class AbstractResourceInfo {
property = bus.getProperty(prop);
if (property == null && create) {
Map<Class<?>, Map<T, ThreadLocalProxy<?>>> map
- = new ConcurrentHashMap<Class<?>, Map<T, ThreadLocalProxy<?>>>(2);
+ = Collections.synchronizedMap(new WeakHashMap<Class<?>, Map<T, ThreadLocalProxy<?>>>(2));
bus.setProperty(prop, map);
property = map;
}
@@ -199,7 +199,7 @@ public abstract class AbstractResourceInfo {
Object property = bus.getProperty(CONSTRUCTOR_PROXY_MAP);
if (property == null) {
Map<Class<?>, Map<Class<?>, ThreadLocalProxy<?>>> map
- = new ConcurrentHashMap<Class<?>, Map<Class<?>, ThreadLocalProxy<?>>>(2);
+ = Collections.synchronizedMap(new WeakHashMap<Class<?>, Map<Class<?>, ThreadLocalProxy<?>>>(2));
bus.setProperty(CONSTRUCTOR_PROXY_MAP, map);
property = map;
}