deki closed pull request #404: [CXF-7707] JAXB doesn't (un)marshall property
with @XmlElementRef
URL: https://github.com/apache/cxf/pull/404
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index 6f224b11ad6..bfa4d3cd020 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -47,6 +47,7 @@
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.ValidationEventHandler;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
@@ -798,6 +799,12 @@ private static Field getElField(String partName, final
Class<?> wrapperType) {
&& partName.equals(el.name())) {
return field;
}
+
+ XmlElementRef xmlElementRefAnnotation =
field.getAnnotation(XmlElementRef.class);
+ if (xmlElementRefAnnotation != null &&
partName.equals(xmlElementRefAnnotation.name())) {
+ return field;
+ }
+
if (field.getName().equals(fieldName)) {
return field;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
