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 2017/02/14 17:48:00 UTC
cxf git commit: Fix following WSS4J changes
Repository: cxf
Updated Branches:
refs/heads/master 315a6dc11 -> f3bb66deb
Fix following WSS4J changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3bb66de
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3bb66de
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3bb66de
Branch: refs/heads/master
Commit: f3bb66deb0757478a33e0c3609428e7450cf3edb
Parents: 315a6dc
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 14 15:33:41 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Feb 14 17:43:56 2017 +0000
----------------------------------------------------------------------
.../org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f3bb66de/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
index 7e0c9f2..15d7a82 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
@@ -176,6 +176,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
}
}
+ @SuppressWarnings("deprecation")
private void handleMessageInternal(SoapMessage msg) throws Fault {
boolean utWithCallbacks =
MessageUtils.getContextualBoolean(msg, SecurityConstants.VALIDATE_TOKEN, true);
@@ -250,9 +251,9 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
// Only search for and expand (Signed) XOP Elements if MTOM is enabled (and not
// explicitly specified by the user)
- String expandXOP = getString(WSHandlerConstants.EXPAND_XOP_INCLUDE_FOR_SIGNATURE, msg);
- if (expandXOP == null) {
- reqData.setExpandXopIncludeForSignature(AttachmentUtil.isMtomEnabled(msg));
+ if (getString(WSHandlerConstants.EXPAND_XOP_INCLUDE_FOR_SIGNATURE, msg) == null
+ && getString(WSHandlerConstants.EXPAND_XOP_INCLUDE, msg) == null) {
+ reqData.setExpandXopInclude(AttachmentUtil.isMtomEnabled(msg));
}
/*get chance to check msg context enableRevocation setting