[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistent...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov 17 11:54:25 2015
New Revision: 8000

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8000&view=rev
Log:
IDP-868 - Stored persistent IDs can be invalidated by a date in the future

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java?rev=8000&r1=7999&r2=8000&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java	Tue Nov 17 11:54:25 2015
@@ -548,7 +548,8 @@
         
                 log.debug("{} Getting active and/or last inactive persistent Id entry", getLogPrefix());
                 final List<PersistentIdEntry> entries = buildIdentifierEntries(statement.executeQuery());
-                if (entries != null && entries.size() > 0 && entries.get(0).getDeactivationTime() == null) {
+                if (entries != null && entries.size() > 0 && (entries.get(0).getDeactivationTime() == null
+                        || entries.get(0).getDeactivationTime().getTime() > System.currentTimeMillis())) {
                     log.debug("{} Returning existing active persistent ID: {}", getLogPrefix(),
                             entries.get(0).getPersistentId());
                     dbConn.commit();