Author: mmusaji Date: 2013-08-28 08:17:12 -0400 (Wed, 28 Aug 2013) New Revision: 17894 Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10856/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Log: [JBPAPP-10856] Merged CXF-5219 Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10856/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10856/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2013-08-28 10:15:23 UTC (rev 17893) +++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10856/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2013-08-28 12:17:12 UTC (rev 17894) @@ -347,6 +347,14 @@ Field fields[] = cls.getDeclaredFields(); for (Field f : fields) { if (isFieldAccepted(f, accessType)) { + XmlJavaTypeAdapter xjta = Utils.getFieldXJTA(f); + if (xjta != null) { + Type t = Utils.getTypeFromXmlAdapter(xjta); + if (t != null) { + addType(t); + continue; + } + } addType(f.getGenericType()); } } @@ -357,6 +365,14 @@ Method methods[] = cls.getDeclaredMethods(); for (Method m : methods) { if (isMethodAccepted(m, accessType)) { + XmlJavaTypeAdapter xjta = Utils.getMethodXJTA(m); + if (xjta != null) { + Type t = Utils.getTypeFromXmlAdapter(xjta); + if (t != null) { + addType(t); + continue; + } + } addType(m.getGenericReturnType()); for (Type t : m.getGenericParameterTypes()) { addType(t);