You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/11/04 13:08:25 UTC
svn commit: r1538571 -
/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
Author: coheigea
Date: Mon Nov 4 12:08:25 2013
New Revision: 1538571
URL: http://svn.apache.org/r1538571
Log:
Merged revisions 1538567 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1538567 | coheigea | 2013-11-04 11:58:01 +0000 (Mon, 04 Nov 2013) | 10 lines
Merged revisions 1538566 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1538566 | coheigea | 2013-11-04 11:48:00 +0000 (Mon, 04 Nov 2013) | 2 lines
[CXF-4987] - org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor disables mtom silently
........
........
Modified:
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java?rev=1538571&r1=1538570&r2=1538571&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java Mon Nov 4 12:08:25 2013
@@ -116,7 +116,12 @@ public class WSS4JOutInterceptor extends
//must turn off mtom when using WS-Sec so binary is inlined so it can
//be properly signed/encrypted/etc...
if (!mtomEnabled) {
- mc.put(org.apache.cxf.message.Message.MTOM_ENABLED, false);
+ String mtomKey = org.apache.cxf.message.Message.MTOM_ENABLED;
+ if (mc.get(mtomKey) == Boolean.TRUE) {
+ LOG.warning("MTOM will be disabled as the WSS4JOutInterceptor.mtomEnabled property"
+ + " is set to false");
+ }
+ mc.put(mtomKey, Boolean.FALSE);
}
if (mc.getContent(SOAPMessage.class) == null) {