You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/05/29 08:46:48 UTC
[cxf] branch CXF-8290 created (now 4ef74e0)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch CXF-8290
in repository https://gitbox.apache.org/repos/asf/cxf.git.
at 4ef74e0 CXF-8290 - Don't lock by default in org.apache.cxf.jaxrs.model.AbstractResourceInfo#getProxyMap
This branch includes the following new commits:
new 92d4bfe Updating to ActiveMQ 5.15.13
new 4ef74e0 CXF-8290 - Don't lock by default in org.apache.cxf.jaxrs.model.AbstractResourceInfo#getProxyMap
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[cxf] 02/02: CXF-8290 - Don't lock by default in
org.apache.cxf.jaxrs.model.AbstractResourceInfo#getProxyMap
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch CXF-8290
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4ef74e06bf332d474847a8d1e49139a434605c7c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 29 09:46:19 2020 +0100
CXF-8290 - Don't lock by default in org.apache.cxf.jaxrs.model.AbstractResourceInfo#getProxyMap
---
.../main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java | 7 +++++++
1 file changed, 7 insertions(+)
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 106aea6..595e0c8 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
@@ -177,6 +177,13 @@ public abstract class AbstractResourceInfo {
@SuppressWarnings("unchecked")
private <T> Map<Class<?>, Map<T, ThreadLocalProxy<?>>> getProxyMap(String prop, boolean create) {
+ // Avoid synchronizing on the bus for a ConcurrentHashMAp
+ if (bus.getProperties() instanceof ConcurrentHashMap) {
+ return (Map<Class<?>, Map<T, ThreadLocalProxy<?>>>) bus.getProperties().computeIfAbsent(prop, k ->
+ new ConcurrentHashMap<Class<?>, Map<T, ThreadLocalProxy<?>>>(2)
+ );
+ }
+
Object property = null;
synchronized (bus) {
property = bus.getProperty(prop);
[cxf] 01/02: Updating to ActiveMQ 5.15.13
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch CXF-8290
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 92d4bfe929c5d11f19c6dd2974f0f880ba7d5382
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 29 09:46:02 2020 +0100
Updating to ActiveMQ 5.15.13
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4dc365f..798602d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,7 +78,7 @@
<!-- please maintain alphabetical order here -->
<cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
<cxf.abdera.version>1.1.3</cxf.abdera.version>
- <cxf.activemq.version>5.15.12</cxf.activemq.version>
+ <cxf.activemq.version>5.15.13</cxf.activemq.version>
<cxf.ahc.version>2.12.1</cxf.ahc.version>
<cxf.apacheds.version>2.0.0.AM26</cxf.apacheds.version>
<cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version>