svn commit: r1370340 - /cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java

[coheigea]

Author: coheigea
Date: Tue Aug  7 16:19:37 2012
New Revision: 1370340

URL: http://svn.apache.org/viewvc?rev=1370340&view=rev
Log:
Merged revisions 1370295 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1370295 | coheigea | 2012-08-07 15:59:13 +0100 (Tue, 07 Aug 2012) | 2 lines

  Only use default statement providers when no user-configured provider is 
available

........


Conflicts:

        
services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java

Modified:
    
cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java

Modified: 
cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java?rev=1370340&r1=1370339&r2=1370340&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
 Tue Aug  7 16:19:37 2012
@@ -440,10 +440,11 @@ public class SAMLTokenProvider implement
             }
         }
         
-        // If no statements, then default to the 
DefaultAttributeStatementProvider
-        if ((attrBeanList == null || attrBeanList.isEmpty()) 
-            && (authBeanList == null || authBeanList.isEmpty())
-            && (authDecisionBeanList == null || 
authDecisionBeanList.isEmpty())) {
+        // If no providers have been configured, then default to the 
+        // DefaultAttributeStatementProvider
+        if ((attributeStatementProviders == null || 
attributeStatementProviders.isEmpty()) 
+            && (authenticationStatementProviders == null || 
authenticationStatementProviders.isEmpty())
+            && (authDecisionStatementProviders == null || 
authDecisionStatementProviders.isEmpty())) {
             attrBeanList = new ArrayList<AttributeStatementBean>();
             AttributeStatementProvider attributeProvider = new 
DefaultAttributeStatementProvider();
             AttributeStatementBean attributeBean = 
attributeProvider.getStatement(tokenParameters);