Author: dkulp Date: Mon Jul 15 18:49:55 2013 New Revision: 1503408 URL: http://svn.apache.org/r1503408 Log: Merged revisions 1500009 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1500009 | asoldano | 2013-07-05 09:49:54 -0400 (Fri, 05 Jul 2013) | 16 lines Merged revisions 1500004 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1500004 | asoldano | 2013-07-05 15:35:07 +0200 (Fri, 05 Jul 2013) | 9 lines Merged revisions 1499998 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1499998 | asoldano | 2013-07-05 15:26:28 +0200 (Fri, 05 Jul 2013) | 2 lines [CXF-5110] Wrong processing of @XmlJavaTypeAdapter with RPC style endpoints ........ ................ ........ Modified: cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java Modified: cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java?rev=1503408&r1=1503407&r2=1503408&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java (original) +++ cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java Mon Jul 15 18:49:55 2013 @@ -34,6 +34,8 @@ import javax.xml.validation.Schema; import org.apache.cxf.jaxb.attachment.JAXBAttachmentMarshaller; import org.apache.cxf.jaxb.attachment.JAXBAttachmentUnmarshaller; import org.apache.cxf.message.Attachment; +import org.apache.cxf.service.model.AbstractMessageContainer; +import org.apache.cxf.service.model.MessageInfo; import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; @@ -99,6 +101,7 @@ public abstract class JAXBDataBase { } if (annoList.size() == 0 && mpi != null && mpi.getMessageInfo() != null + && isOutputMessage(mpi.getMessageInfo()) && mpi.getMessageInfo().getOperation() != null && mpi.getMessageInfo().getOperation().getProperty("method.return.annotations") != null) { OperationInfo op = mpi.getMessageInfo().getOperation(); @@ -113,6 +116,13 @@ public abstract class JAXBDataBase { } return annoList.toArray(new Annotation[]{}); } + + protected boolean isOutputMessage(AbstractMessageContainer messageContainer) { + if (messageContainer instanceof MessageInfo) { + return MessageInfo.Type.OUTPUT.equals(((MessageInfo)messageContainer).getType()); + } + return false; + } public Integer getMtomThreshold() { return mtomThreshold;
