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 2009/05/07 19:34:25 UTC
svn commit: r772720 - in /cxf/branches/2.1.x-fixes: ./
rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
Author: dkulp
Date: Thu May 7 17:34:25 2009
New Revision: 772720
URL: http://svn.apache.org/viewvc?rev=772720&view=rev
Log:
Merged revisions 772714 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r772714 | dkulp | 2009-05-07 13:19:30 -0400 (Thu, 07 May 2009) | 2 lines
[CXF-2201] Oneway ops confuse the XML validator
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 7 17:34:25 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java?rev=772720&r1=772719&r2=772720&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java (original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java Thu May 7 17:34:25 2009
@@ -82,8 +82,11 @@
if (inExtensors != null) {
itIn = inExtensors.iterator();
}
- if (findXMLFormatRootNode(itIn, bo, path + "-input")) {
- // Input check correct, continue to check output binding
+ if (!findXMLFormatRootNode(itIn, bo, path + "-input")) {
+ return false;
+ }
+ // Input check correct, continue to check output binding
+ if (op.getOutput() != null) {
needRootNode = false;
if (op.getOutput().getMessageParts().size() == 0
|| op.getOutput().getMessageParts().size() > 1) {
@@ -102,8 +105,6 @@
return false;
}
}
- } else {
- return false;
}
}
}