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 2012/09/20 16:27:25 UTC

svn commit: r1388043 - /cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java

Author: coheigea
Date: Thu Sep 20 14:27:24 2012
New Revision: 1388043

URL: http://svn.apache.org/viewvc?rev=1388043&view=rev
Log:
[FEDIZ-26] - SAMLTokenValidator throws a NPE when an Attribute of the Assertion does not have a NameFormat. 

Modified:
    cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java

Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java?rev=1388043&r1=1388042&r2=1388043&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java Thu Sep 20 14:27:24 2012
@@ -320,7 +320,7 @@ public class SAMLTokenValidator implemen
                 // if NameFormat is http://schemas.xmlsoap.org/ws/2005/05/identity/claims
                 // but ClaimType value must be fully qualified as Namespace attribute goes away
                 URI attrName = URI.create(attribute.getName());
-                if (attribute.getNameFormat().equals(ClaimTypes.URI_BASE.toString()) 
+                if (ClaimTypes.URI_BASE.toString().equals(attribute.getNameFormat())
                     && !attrName.isAbsolute()) {
                     c.setClaimType(URI.create(ClaimTypes.URI_BASE + "/" + attribute.getName()));
                 } else {