You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2010/12/10 12:40:30 UTC
svn commit: r1044305 -
/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
Author: ningjiang
Date: Fri Dec 10 11:40:30 2010
New Revision: 1044305
URL: http://svn.apache.org/viewvc?rev=1044305&view=rev
Log:
CXF-3180 removed the synchronized part of JAXBMarshallerUnmarshallerCache as it is used per thread
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=1044305&r1=1044304&r2=1044305&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java Fri Dec 10 11:40:30 2010
@@ -714,30 +714,28 @@ public abstract class AbstractJAXBProvid
if (jaxbContext == null) {
return null;
}
- synchronized (marshallers) {
- Marshaller marshaller = marshallers.get(jaxbContext);
- if (marshaller == null) {
- marshaller = jaxbContext.createMarshaller();
- marshallers.put(jaxbContext, marshaller);
- }
- return marshaller;
+ // don't need the synchronized statement, as this ojbect is used per thread
+ Marshaller marshaller = marshallers.get(jaxbContext);
+ if (marshaller == null) {
+ marshaller = jaxbContext.createMarshaller();
+ marshallers.put(jaxbContext, marshaller);
}
-
+ return marshaller;
+
}
-
+
public Unmarshaller getUnmarshall(JAXBContext jaxbContext) throws JAXBException {
if (jaxbContext == null) {
return null;
}
- synchronized (unmarshallers) {
- Unmarshaller unmarshaller = unmarshallers.get(jaxbContext);
- if (unmarshaller == null) {
- unmarshaller = jaxbContext.createUnmarshaller();
- unmarshallers.put(jaxbContext, unmarshaller);
- }
- return unmarshaller;
+ // don't need the synchronized statement, as this ojbect is used per thread
+ Unmarshaller unmarshaller = unmarshallers.get(jaxbContext);
+ if (unmarshaller == null) {
+ unmarshaller = jaxbContext.createUnmarshaller();
+ unmarshallers.put(jaxbContext, unmarshaller);
}
-
+ return unmarshaller;
+
}
}