svn commit: r1226744 - /cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java

[coheigea]

Author: coheigea
Date: Tue Jan  3 11:35:26 2012
New Revision: 1226744

URL: http://svn.apache.org/viewvc?rev=1226744&view=rev
Log:
Simplifying SAML Conditions checking in the STS

Modified:
    
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java

Modified: 
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java?rev=1226744&r1=1226743&r2=1226744&view=diff
==============================================================================
--- 
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
 (original)
+++ 
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
 Tue Jan  3 11:35:26 2012
@@ -194,7 +194,7 @@ public class SAMLTokenValidator implemen
                 validFrom = 
assertion.getSaml1().getConditions().getNotBefore();
                 validTill = 
assertion.getSaml1().getConditions().getNotOnOrAfter();
             }
-            if (!(validFrom.isBeforeNow() && validTill.isAfterNow())) {
+            if (validFrom.isAfterNow() || validTill.isBeforeNow()) {
                 LOG.log(Level.WARNING, "SAML Token condition not met");
                 if (secToken != null) {
                     tokenParameters.getTokenStore().remove(secToken);