Repository: cxf Updated Branches: refs/heads/3.0.x-fixes b5524e805 -> f129e0b78
Minor refactor Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e943fc08 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e943fc08 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e943fc08 Branch: refs/heads/3.0.x-fixes Commit: e943fc08143bef8e512c9e101c088c628d41a7dd Parents: b5524e8 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Sep 25 11:20:54 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Sep 25 11:44:49 2015 +0100 ---------------------------------------------------------------------- .../wss4j/policyhandlers/AsymmetricBindingHandler.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e943fc08/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java index 7e55e12..c7576c6 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java @@ -135,12 +135,10 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder { if (secToken == null) { policyNotAsserted(initiatorToken, "Security token is not found or expired"); return; - } else { - if (isTokenRequired(initiatorToken.getIncludeTokenType())) { - Element el = secToken.getToken(); - this.addEncryptedKeyElement(cloneElement(el)); - attached = true; - } + } else if (isTokenRequired(initiatorToken.getIncludeTokenType())) { + Element el = secToken.getToken(); + this.addEncryptedKeyElement(cloneElement(el)); + attached = true; } } else if (initiatorToken instanceof SamlToken && isRequestor()) { SamlAssertionWrapper assertionWrapper = addSamlToken((SamlToken)initiatorToken);
