Author: dkulp
Date: Wed May 5 06:34:40 2010
New Revision: 941165
URL: http://svn.apache.org/viewvc?rev=941165&view=rev
Log:
Merged revisions 941160 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r941160 | dkulp | 2010-05-05 02:27:49 -0400 (Wed, 05 May 2010) | 1 line
[CXF-2798] Pick up addressing from wrapped operation
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=941165&r1=941164&r2=941165&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Wed May 5 06:34:40 2010
@@ -742,8 +742,7 @@ public final class ContextUtils {
action = cachedAction;
}
if (action == null && ContextUtils.isRequestor(message)) {
- SoapOperationInfo soi =
- bindingOpInfo.getExtensor(SoapOperationInfo.class);
+ SoapOperationInfo soi =
getSoapOperationInfo(bindingOpInfo);
action = soi == null ? null : soi.getAction();
action = StringUtils.isEmpty(action) ? null : action;
}
@@ -782,6 +781,15 @@ public final class ContextUtils {
return action;
}
+ private static SoapOperationInfo getSoapOperationInfo(BindingOperationInfo
bindingOpInfo) {
+ SoapOperationInfo soi =
bindingOpInfo.getExtensor(SoapOperationInfo.class);
+ if (soi == null && bindingOpInfo.isUnwrapped()) {
+ soi = bindingOpInfo.getWrappedOperation()
+ .getExtensor(SoapOperationInfo.class);
+ }
+ return soi;
+ }
+
/**
* Get action from attributes on MessageInfo
*
