svn commit: r1538566 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java

[coheigea]

Author: coheigea
Date: Mon Nov  4 11:48:00 2013
New Revision: 1538566

URL: http://svn.apache.org/r1538566
Log:
[CXF-4987] - org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor disables mtom 
silently

Modified:
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java?rev=1538566&r1=1538565&r2=1538566&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
 Mon Nov  4 11:48:00 2013
@@ -115,7 +115,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) {