Repository: cxf Updated Branches: refs/heads/master 99f4092de -> 785955e8a
Check for Symmetric/Asymmetric before Transport policies Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/785955e8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/785955e8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/785955e8 Branch: refs/heads/master Commit: 785955e8a26a891296908796abac0b1cf88c94ce Parents: 99f4092 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Jun 19 15:38:16 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Jun 19 15:38:16 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/ws/security/policy/PolicyUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/785955e8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/PolicyUtils.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/PolicyUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/PolicyUtils.java index d493f05..495a1ef 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/PolicyUtils.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/PolicyUtils.java @@ -248,12 +248,6 @@ public final class PolicyUtils { public static AbstractBinding getSecurityBinding(AssertionInfoMap aim) { - AssertionInfo transAis = PolicyUtils.getFirstAssertionByLocalname(aim, SPConstants.TRANSPORT_BINDING); - if (transAis != null) { - transAis.setAsserted(true); - return (AbstractBinding)transAis.getAssertion(); - } - AssertionInfo asymAis = PolicyUtils.getFirstAssertionByLocalname(aim, SPConstants.ASYMMETRIC_BINDING); if (asymAis != null) { asymAis.setAsserted(true); @@ -266,6 +260,12 @@ public final class PolicyUtils { return (AbstractBinding)symAis.getAssertion(); } + AssertionInfo transAis = PolicyUtils.getFirstAssertionByLocalname(aim, SPConstants.TRANSPORT_BINDING); + if (transAis != null) { + transAis.setAsserted(true); + return (AbstractBinding)transAis.getAssertion(); + } + return null; }
