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 2010/01/27 16:46:25 UTC
svn commit: r903692 - in /cxf/branches/2.2.x-fixes: ./
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Author: dkulp
Date: Wed Jan 27 15:46:25 2010
New Revision: 903692
URL: http://svn.apache.org/viewvc?rev=903692&view=rev
Log:
Merged revisions 903679 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r903679 | dkulp | 2010-01-27 10:26:49 -0500 (Wed, 27 Jan 2010) | 4 lines
[CXF-2629] Fix WS-Addressing Action on response is not being returned as
specified in the WSDL.
Patch from Rebecca Duhard applied
........
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=903692&r1=903691&r2=903692&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 Jan 27 15:46:25 2010
@@ -32,7 +32,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapBindingConstants;
-import org.apache.cxf.binding.soap.model.SoapOperationInfo;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.ConduitSelector;
import org.apache.cxf.endpoint.Endpoint;
@@ -729,14 +728,7 @@
}
if (fault == null) {
action = (String) message.get(SoapBindingConstants.SOAP_ACTION);
- if (action == null) {
- SoapOperationInfo soi =
- bindingOpInfo.getExtensor(SoapOperationInfo.class);
- if (null != soi) {
- action = soi.getAction();
- }
-
- }
+
if (action == null || "".equals(action)) {
MessageInfo msgInfo =
ContextUtils.isRequestor(message)