You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/10/09 17:39:24 UTC
svn commit: r1396079 - in /incubator/syncope/trunk: ./
core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
Author: ilgrosso
Date: Tue Oct 9 15:39:24 2012
New Revision: 1396079
URL: http://svn.apache.org/viewvc?rev=1396079&view=rev
Log:
Merge from 1_0_X
Modified:
incubator/syncope/trunk/ (props changed)
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
Propchange: incubator/syncope/trunk/
------------------------------------------------------------------------------
Merged /incubator/syncope/branches/1_0_X:r1395988-1396077
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java?rev=1396079&r1=1396078&r2=1396079&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java Tue Oct 9 15:39:24 2012
@@ -419,7 +419,9 @@ public class SyncopeUser extends Abstrac
}
public boolean hasTokenExpired() {
- return tokenExpireTime.before(new Date());
+ return tokenExpireTime == null
+ ? null
+ : tokenExpireTime.before(new Date());
}
public CipherAlgorithm getCipherAlgorithm() {