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 2013/04/08 20:29:52 UTC
svn commit: r1465712 -
/cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Author: dkulp
Date: Mon Apr 8 18:29:52 2013
New Revision: 1465712
URL: http://svn.apache.org/r1465712
Log:
Merged revisions 1465707 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1465707 | dkulp | 2013-04-08 14:26:46 -0400 (Mon, 08 Apr 2013) | 2 lines
Don't stick the service namespace onto the message as it's likely not the right namespace. If anything, should check the schemas instead, but for the most part, that's not needed.
........
Modified:
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Modified: cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=1465712&r1=1465711&r2=1465712&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Mon Apr 8 18:29:52 2013
@@ -475,15 +475,14 @@ public class SoapBindingFactory extends
Map<String, String> nsMap = message.getEnvelopeNs();
if (nsMap == null) {
nsMap = new HashMap<String, String>();
- message.put("soap.env.ns.map", nsMap);
+ } else {
+ nsMap = new HashMap<String, String>(nsMap);
}
- if (!nsMap.containsValue(ns)) {
+ message.put("soap.env.ns.map", nsMap);
+ if (!nsMap.containsValue(ns)
+ && !nsMap.containsKey("wsa")) {
nsMap.put("wsa", ns);
}
- ns = message.getExchange().getBinding().getBindingInfo().getName().getNamespaceURI();
- if (!nsMap.containsValue(ns)) {
- nsMap.put("tns", ns);
- }
message.put(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION, Boolean.TRUE);
}
});