Author: dkulp Date: Tue Feb 21 22:04:28 2012 New Revision: 1292058 URL: http://svn.apache.org/viewvc?rev=1292058&view=rev Log: Merged revisions 1292056 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1292056 | dkulp | 2012-02-21 16:56:57 -0500 (Tue, 21 Feb 2012) | 19 lines Merged revisions 1292052 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1292052 | dkulp | 2012-02-21 16:55:57 -0500 (Tue, 21 Feb 2012) | 11 lines Merged revisions 1292049 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1292049 | dkulp | 2012-02-21 16:51:10 -0500 (Tue, 21 Feb 2012) | 4 lines [CXF-4117] Fix issue when building service model where setting the part class on output part info's wasn't finding the part by name in the same way as setting it on the input part (which is working). ........ ........ ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Propchange: cxf/branches/2.3.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1292058&r1=1292057&r2=1292058&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Tue Feb 21 22:04:28 2012 @@ -830,7 +830,19 @@ public class ReflectionServiceFactoryBea initializeParameter(part, paramType, genericType); part.setIndex(i); + QName inName = part.getConcreteName(); part = o.getOutput().getMessagePart(name); + + if (part == null) { + part = o.getOutput().getMessagePart(inName); + } + if (part == null && isHeader && o.isUnwrapped()) { + part = o.getUnwrappedOperation().getOutput().getMessagePart(name); + if (part == null) { + part = o.getUnwrappedOperation().getOutput().getMessagePart(inName); + } + } + if (part == null) { return false; }
