Author: dkulp
Date: Mon Apr 6 15:44:58 2009
New Revision: 762395
URL: http://svn.apache.org/viewvc?rev=762395&view=rev
Log:
Merged revisions 762393 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r762393 | dkulp | 2009-04-06 11:41:28 -0400 (Mon, 06 Apr 2009) | 2 lines
In some cases, some of the message properties were not being set.
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 6 15:44:58 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,761759,761789
+/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,761759,761789,762393
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java?rev=762395&r1=762394&r2=762395&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
Mon Apr 6 15:44:58 2009
@@ -123,9 +123,11 @@
} else {
//Bare style
BindingMessageInfo msgInfo = null;
+
+ Endpoint ep = exchange.get(Endpoint.class);
+ ServiceInfo si = ep.getEndpointInfo().getService();
if (bop != null) { //for xml binding or client side
- getMessageInfo(message, bop);
if (client) {
msgInfo = bop.getOutput();
} else {
@@ -134,12 +136,11 @@
exchange.setOneWay(true);
}
}
+ setMessage(message, bop, client, si,
msgInfo.getMessageInfo());
}
Collection<OperationInfo> operations = null;
operations = new ArrayList<OperationInfo>();
- Endpoint ep = exchange.get(Endpoint.class);
- ServiceInfo si = ep.getEndpointInfo().getService();
operations.addAll(si.getInterface().getOperations());
if (!StaxUtils.toNextElement(xmlReader)) {
@@ -246,6 +247,11 @@
private MessageInfo setMessage(Message message, BindingOperationInfo
operation,
boolean requestor, ServiceInfo si) {
MessageInfo msgInfo = getMessageInfo(message, operation, requestor);
+ return setMessage(message, operation, requestor, si, msgInfo);
+ }
+ private MessageInfo setMessage(Message message, BindingOperationInfo
operation,
+ boolean requestor, ServiceInfo si,
+ MessageInfo msgInfo) {
message.put(MessageInfo.class, msgInfo);
Exchange ex = message.getExchange();
