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/08/23 23:32:23 UTC
svn commit: r1517059 -
/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Author: dkulp
Date: Fri Aug 23 21:32:23 2013
New Revision: 1517059
URL: http://svn.apache.org/r1517059
Log:
[CXF-5217] Set namspace to null if no schema found (assumes unqualified elements which is default for JAX-WS/JAXB)
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1517059&r1=1517058&r2=1517059&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Fri Aug 23 21:32:23 2013
@@ -355,12 +355,11 @@ public final class JAXBEncoderDecoder {
SchemaInfo sch = part.getMessageInfo().getOperation().getInterface()
.getService().getSchema(namespace);
- if (sch != null) {
- if (!sch.isElementFormQualified()) {
- namespace = null;
- }
- } else {
+ if (sch == null) {
LOG.warning("Schema associated with " + namespace + " is null");
+ namespace = null;
+ } else if (!sch.isElementFormQualified()) {
+ namespace = null;
}
List<Member> combinedMembers = new ArrayList<Member>();