Author: dkulp Date: Mon Aug 26 15:58:07 2013 New Revision: 1517581 URL: http://svn.apache.org/r1517581 Log: Merged revisions 1517574 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1517574 | dkulp | 2013-08-26 11:51:53 -0400 (Mon, 26 Aug 2013) | 10 lines Merged revisions 1517059 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1517059 | dkulp | 2013-08-23 17:32:23 -0400 (Fri, 23 Aug 2013) | 2 lines [CXF-5217] Set namspace to null if no schema found (assumes unqualified elements which is default for JAX-WS/JAXB) ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1517581&r1=1517580&r2=1517581&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Mon Aug 26 15:58:07 2013 @@ -354,12 +354,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>();
