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 2008/02/06 03:57:51 UTC
svn commit: r618861 - in /incubator/cxf/branches/2.0.x-fixes: ./
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Author: dkulp
Date: Tue Feb 5 18:57:48 2008
New Revision: 618861
URL: http://svn.apache.org/viewvc?rev=618861&view=rev
Log:
Merged revisions 616069 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r616069 | dkulp | 2008-01-28 16:52:56 -0500 (Mon, 28 Jan 2008) | 2 lines
Fix processing of the various accesstypes
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=618861&r1=618860&r2=618861&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Tue Feb 5 18:57:48 2008
@@ -222,7 +222,8 @@
return false;
}
- if (accessType == XmlAccessType.NONE) {
+ if (accessType == XmlAccessType.NONE
+ || accessType == XmlAccessType.PROPERTY) {
return checkJaxbAnnotation(field.getAnnotations());
} else {
return true;
@@ -264,7 +265,8 @@
return false;
}
- if (accessType == XmlAccessType.NONE) {
+ if (accessType == XmlAccessType.NONE
+ || accessType == XmlAccessType.FIELD) {
return checkJaxbAnnotation(method.getAnnotations());
} else {
return true;