You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/09/12 21:34:34 UTC
svn commit: r1169890 - in /cxf/branches/2.4.x-fixes: ./
common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
Author: dkulp
Date: Mon Sep 12 19:34:34 2011
New Revision: 1169890
URL: http://svn.apache.org/viewvc?rev=1169890&view=rev
Log:
Merged revisions 1169880 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1169880 | dkulp | 2011-09-12 15:19:13 -0400 (Mon, 12 Sep 2011) | 1 line
[CXF-3801] Make sure the calls into the CacheMap are fully synchronized.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java?rev=1169890&r1=1169889&r2=1169890&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java (original)
+++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java Mon Sep 12 19:34:34 2011
@@ -158,7 +158,9 @@ public final class JAXBContextCache {
if (cachedContextAndSchemas != null) {
context = cachedContextAndSchemas.getContext();
if (context == null) {
- JAXBCONTEXT_CACHE.remove(cachedContextAndSchemas.getClasses());
+ synchronized (JAXBCONTEXT_CACHE) {
+ JAXBCONTEXT_CACHE.remove(cachedContextAndSchemas.getClasses());
+ }
cachedContextAndSchemas = null;
}
}