Author: anil.saldhana(a)jboss.com Date: 2010-11-04 12:46:44 -0400 (Thu, 04 Nov 2010) New Revision: 523 Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java Log: consider the case when attribs is null Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2010-11-04 05:48:13 UTC (rev 522) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2010-11-04 16:46:44 UTC (rev 523) @@ -225,7 +225,7 @@ saml2Response.createTimedConditions(assertion, assertionValidity); //Add in the attributes information - if(attribs != null) + if(attribs != null && attribs.size() > 0 ) { AttributeStatementType attStatement = StatementUtil.createAttributeStatement(attribs); assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(attStatement); @@ -255,6 +255,7 @@ } catch (Exception e) { + e.printStackTrace(); if(trace) log.trace(e); }