You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2012/10/23 18:08:24 UTC

svn commit: r1401333 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java

Author: angela
Date: Tue Oct 23 16:08:23 2012
New Revision: 1401333

URL: http://svn.apache.org/viewvc?rev=1401333&view=rev
Log:
 OAK-91 - Implement Authentication Support (WIP)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java?rev=1401333&r1=1401332&r2=1401333&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java Tue Oct 23 16:08:23 2012
@@ -252,14 +252,9 @@ public class TokenProviderImpl implement
 
 
     //--------------------------------------------------------------------------
-    // TODO: that should be done by the property state or some utility
+
     private static long getExpirationTime(NodeUtil tokenNode, long defaultValue) {
-        String date = tokenNode.getString(TOKEN_ATTRIBUTE_EXPIRY, null);
-        if (date == null) {
-            return defaultValue;
-        } else {
-            return ISO8601.parse(date).getTimeInMillis();
-        }
+        return tokenNode.getLong(TOKEN_ATTRIBUTE_EXPIRY, defaultValue);
     }
 
     @CheckForNull