[picketlink-commits] Picketlink SVN: r780 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util.

[picketlink-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2011-02-28 09:47:03 -0500 (Mon, 28 Feb 2011)
New Revision: 780

Modified:
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java
Log:
add log info statement that the expiration has expired

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java	2011-02-25 22:39:31 UTC (rev 779)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java	2011-02-28 14:47:03 UTC (rev 780)
@@ -147,6 +147,8 @@
     */
    public static boolean hasExpired(AssertionType assertion) throws ConfigurationException
    {
+      boolean expiry = false;
+      
       //Check for validity of assertion
       ConditionsType conditionsType = assertion.getConditions();
       if(conditionsType != null)
@@ -156,10 +158,15 @@
          XMLGregorianCalendar notOnOrAfter = conditionsType.getNotOnOrAfter();
          if(trace) log.trace("Now="+now.toXMLFormat() + " ::notBefore="+notBefore.toXMLFormat() 
                + "::notOnOrAfter="+notOnOrAfter);
-         return !XMLTimeUtil.isValid(now, notBefore, notOnOrAfter); 
+         expiry = !XMLTimeUtil.isValid(now, notBefore, notOnOrAfter); 
+         if( !expiry )
+         {
+            log.info( "Assertion has expired with id=" + assertion.getID() );
+         }
       }
+      
       //TODO: if conditions do not exist, assume the assertion to be everlasting?
-      return false; 
+      return expiry; 
    } 
    
    /**