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:19:38 UTC
svn commit: r1477277 -
/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
Author: dkulp
Date: Mon Apr 29 19:19:38 2013
New Revision: 1477277
URL: http://svn.apache.org/r1477277
Log:
Merged revisions 1464141 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1464141 | dkulp | 2013-04-03 14:29:23 -0400 (Wed, 03 Apr 2013) | 18 lines
Merged revisions 1464139 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1464139 | dkulp | 2013-04-03 14:25:58 -0400 (Wed, 03 Apr 2013) | 10 lines
Merged revisions 1464133 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1464133 | dkulp | 2013-04-03 14:04:57 -0400 (Wed, 03 Apr 2013) | 2 lines
Fix potential problems with the JAXBContext being null
........
........
........
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=1477277&r1=1477276&r2=1477277&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:19:38 2013
@@ -47,14 +47,13 @@ import org.apache.cxf.common.util.String
/**
*
*/
-public final class JAXBContextCache {
-
+public final class JAXBContextCache {
/**
* Return holder of the context, classes, etc...
* Do NOT hold onto these strongly as that can lock the JAXBContext and Set<Class> objects
- * into memory. It preferred to grab the context and classes (if needed) from this object
+ * into memory. It prefererred to grab the context and classes (if needed) from this object
* immediately after the call to getCachedContextAndSchemas and then discard it. The
- * main purpose of this class is to hold onto the context/set strongly until the caller
+ * main purpose of this class is to hold onto the context/set stongly until the caller
* has a chance to copy those into a place where they can hold onto it strongly as
* needed.
*/