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 2013/04/29 21:20:34 UTC
svn commit: r1477283 -
/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
Author: dkulp
Date: Mon Apr 29 19:20:34 2013
New Revision: 1477283
URL: http://svn.apache.org/r1477283
Log:
Merged revisions 1476302 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1476302 | dkulp | 2013-04-26 13:20:05 -0400 (Fri, 26 Apr 2013) | 2 lines
FIx compile failure
........
Modified:
cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java?rev=1477283&r1=1477282&r2=1477283&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java (original)
+++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java Mon Apr 29 19:20:34 2013
@@ -215,7 +215,7 @@ public final class JAXBContextCache {
} catch (JAXBException ex) {
// load jaxb needed class and try to create jaxb context
boolean added = addJaxbObjectFactory(ex, classes);
- while (cachedContextAndSchemas == null && added) {
+ while (cachedContextAndSchemasInternal == null && added) {
try {
context = AccessController.doPrivileged(new PrivilegedExceptionAction<JAXBContext>() {
public JAXBContext run() throws Exception {