cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1415135 - /cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
Date Thu, 29 Nov 2012 12:01:29 GMT
Author: coheigea
Date: Thu Nov 29 12:01:28 2012
New Revision: 1415135

URL: http://svn.apache.org/viewvc?rev=1415135&view=rev
Log:
[CXF-4664] - Set the Dialect correctly on parsed RequestClaimCollections

Modified:
    cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java

Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java?rev=1415135&r1=1415134&r2=1415135&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
(original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
Thu Nov 29 12:01:28 2012
@@ -170,6 +170,7 @@ public class ClaimsManager {
     private RequestClaimCollection filterHandlerClaims(RequestClaimCollection claims,
                                                          List<URI> handlerClaimTypes)
{
         RequestClaimCollection supportedClaims = new RequestClaimCollection(); 
+        supportedClaims.setDialect(claims.getDialect());
         for (RequestClaim claim : claims) {
             if (handlerClaimTypes.contains(claim.getClaimType())) {
                 supportedClaims.add(claim);
@@ -298,6 +299,8 @@ public class ClaimsManager {
         
         // Merge claims
         RequestClaimCollection mergedClaims = new RequestClaimCollection();
+        mergedClaims.setDialect(primaryClaims.getDialect());
+        
         for (RequestClaim claim : primaryClaims) {
             RequestClaim matchingClaim = null;
             // Search for a matching claim via the ClaimType URI



Mime
View raw message