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:38:14 UTC

svn commit: r1396077 - /incubator/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java

Author: ilgrosso
Date: Tue Oct  9 15:38:14 2012
New Revision: 1396077

URL: http://svn.apache.org/viewvc?rev=1396077&view=rev
Log:
[SYNCOPE-217] Patch applied

Modified:
    incubator/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java

Modified: incubator/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java?rev=1396077&r1=1396076&r2=1396077&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java (original)
+++ incubator/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java Tue Oct  9 15:38:14 2012
@@ -433,7 +433,9 @@ public class SyncopeUser extends Abstrac
     }
 
     public boolean hasTokenExpired() {
-        return tokenExpireTime.before(new Date());
+        return tokenExpireTime == null
+                ? null
+                : tokenExpireTime.before(new Date());
     }
 
     public CipherAlgorithm getCipherAlgoritm() {