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 2017/04/04 16:52:00 UTC
[2/2] cxf git commit: [CXF-7187] Check for the other soap fault
action value to correlate response
[CXF-7187] Check for the other soap fault action value to correlate response
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/10d34e1a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/10d34e1a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/10d34e1a
Branch: refs/heads/master
Commit: 10d34e1a812ab2a709376f008c738de68c8720cf
Parents: 0014800
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Apr 4 12:31:36 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Apr 4 12:31:36 2017 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/cxf/ws/addressing/Names.java | 2 ++
.../src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/10d34e1a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
index 4f4a60c..ead6946 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
@@ -109,6 +109,8 @@ public final class Names {
"/fault";
public static final String WSA_DEFAULT_FAULT_ACTION =
WSA_NAMESPACE_NAME + WSA_FAULT_DELIMITER;
+ public static final String WSA_DEFAULT_SOAP_FAULT_ACTION =
+ WSA_NAMESPACE_NAME + "/soap" + WSA_FAULT_DELIMITER;
public static final String WSAW_ACTION_NAME = "Action";
public static final QName WSAW_ACTION_QNAME =
http://git-wip-us.apache.org/repos/asf/cxf/blob/10d34e1a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
index f8848f9..0b10aba 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
@@ -855,7 +855,8 @@ public class MAPCodec extends AbstractSoapInterceptor {
}
} else if (maps.getRelatesTo() == null
&& maps.getAction() != null
- && Names.WSA_DEFAULT_FAULT_ACTION.equals(maps.getAction().getValue())) {
+ && (Names.WSA_DEFAULT_FAULT_ACTION.equals(maps.getAction().getValue())
+ || Names.WSA_DEFAULT_SOAP_FAULT_ACTION.equals(maps.getAction().getValue()))) {
//there is an Action header that points to a fault and no relatesTo. Use the out map for the ID
Message m = message.getExchange().getOutMessage();
maps = ContextUtils.retrieveMAPs(m, false, true, false);