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 2015/09/25 15:19:04 UTC

cxf git commit: Minor refactor

Repository: cxf
Updated Branches:
  refs/heads/master 325fdcf12 -> f96f50e5a


Minor refactor


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f96f50e5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f96f50e5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f96f50e5

Branch: refs/heads/master
Commit: f96f50e5afc6a45406558b4dca06c2258797facf
Parents: 325fdcf
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Sep 25 14:18:56 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Sep 25 14:18:56 2015 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f96f50e5/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 aaf2cf0..9846a07 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
@@ -338,12 +338,8 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
     
     private void configureAudienceRestriction(SoapMessage msg, RequestData reqData) {
         // Add Audience Restrictions for SAML
-        boolean enableAudienceRestriction = true;
-        String audRestrValStr = 
-            (String)SecurityUtils.getSecurityPropertyValue(SecurityConstants.AUDIENCE_RESTRICTION_VALIDATION, msg);
-        if (audRestrValStr != null) {
-            enableAudienceRestriction = Boolean.parseBoolean(audRestrValStr);
-        }
+        boolean enableAudienceRestriction = 
+            SecurityUtils.getSecurityPropertyBoolean(SecurityConstants.AUDIENCE_RESTRICTION_VALIDATION, msg, true);
         if (enableAudienceRestriction) {
             List<String> audiences = new ArrayList<>();
             if (msg.getContextualProperty(org.apache.cxf.message.Message.REQUEST_URL) != null) {