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:26:47 UTC
svn commit: r1465707 -
/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Author: dkulp
Date: Mon Apr 8 18:26:46 2013
New Revision: 1465707
URL: http://svn.apache.org/r1465707
Log:
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/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=1465707&r1=1465706&r2=1465707&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Mon Apr 8 18:26:46 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);
}
});