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 2013/10/08 21:03:52 UTC
svn commit: r1530387 -
/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
Author: dkulp
Date: Tue Oct 8 19:03:52 2013
New Revision: 1530387
URL: http://svn.apache.org/r1530387
Log:
[CXF-5322] Fix warning for propOrder
Patch from Lars Geidel applied
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=1530387&r1=1530386&r2=1530387&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Tue Oct 8 19:03:52 2013
@@ -578,13 +578,16 @@ class JAXBSchemaInitializer extends Serv
seq.getItems().add(exEle);
}
- if (propertyOrder != null && propertyOrder.length == seq.getItems().size()) {
- sortItems(seq, propertyOrder);
- } else if (propertyOrder != null && propertyOrder.length != seq.getItems().size()) {
- LOG.log(Level.WARNING, "propOrder in @XmlType doesn't define all schema elements :"
- + Arrays.toString(propertyOrder));
+ if (propertyOrder != null) {
+ if (propertyOrder.length == seq.getItems().size()) {
+ sortItems(seq, propertyOrder);
+ } else if (propertyOrder.length > 1
+ || (propertyOrder.length == 1 && !propertyOrder[0].isEmpty())) {
+ LOG.log(Level.WARNING, "propOrder in @XmlType doesn't define all schema elements :"
+ + Arrays.toString(propertyOrder));
+ }
}
-
+
if (xmlAccessorOrder != null && xmlAccessorOrder.value().equals(XmlAccessOrder.ALPHABETICAL)
&& propertyOrder == null) {
sort(seq);