Author: dkulp Date: Fri Mar 15 21:01:08 2013 New Revision: 1457114 URL: http://svn.apache.org/r1457114 Log: Merged revisions 1457109 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1457109 | dkulp | 2013-03-15 16:52:08 -0400 (Fri, 15 Mar 2013) | 10 lines Merged revisions 1457107 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1457107 | dkulp | 2013-03-15 16:45:02 -0400 (Fri, 15 Mar 2013) | 2 lines Don't add java.* and javax.* things to the context ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1457114&r1=1457113&r2=1457114&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Fri Mar 15 21:01:08 2013 @@ -272,6 +272,9 @@ class JAXBContextInitializer extends Ser walkReferences(cls); } addClass(String.class); + } else if (cls.getName().startsWith("java.") + || cls.getName().startsWith("javax.")) { + return; } else { cls = JAXBUtils.getValidClass(cls); if (null != cls) {
