cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1460829 - /cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Date Mon, 25 Mar 2013 18:43:26 GMT
Author: dkulp
Date: Mon Mar 25 18:43:26 2013
New Revision: 1460829

URL: http://svn.apache.org/r1460829
Log:
Merged revisions 1457114 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1457114 | dkulp | 2013-03-15 17:01:08 -0400 (Fri, 15 Mar 2013) | 18 lines

  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.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java

Modified: cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1460829&r1=1460828&r2=1460829&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Mon Mar 25 18:43:26 2013
@@ -292,6 +292,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) {



Mime
View raw message