You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2017/02/14 17:44:13 UTC

svn commit: r1782994 - /webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java

Author: coheigea
Date: Tue Feb 14 17:44:13 2017
New Revision: 1782994

URL: http://svn.apache.org/viewvc?rev=1782994&view=rev
Log:
Minor XOP fix

Modified:
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java?rev=1782994&r1=1782993&r2=1782994&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java Tue Feb 14 17:44:13 2017
@@ -626,11 +626,13 @@ public abstract class WSHandler {
             decodeBooleanConfigValue(mc, WSHandlerConstants.INCLUDE_SIGNATURE_TOKEN, false);
         actionToken.setIncludeToken(includeToken);
         
-        boolean expandXOP =
-            decodeBooleanConfigValue(
-                reqData.getMsgContext(), WSHandlerConstants.EXPAND_XOP_INCLUDE, false
-        );
-        reqData.setExpandXopInclude(expandXOP);
+        if (!reqData.isExpandXopInclude()) {
+            boolean expandXOP =
+                decodeBooleanConfigValue(
+                    reqData.getMsgContext(), WSHandlerConstants.EXPAND_XOP_INCLUDE, false
+            );
+            reqData.setExpandXopInclude(expandXOP);
+        }
     }
 
     protected void decodeAlgorithmSuite(RequestData reqData) throws WSSecurityException {