svn commit: r1545721 - in /cxf/trunk/rt: rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java

[coheigea]

Author: coheigea
Date: Tue Nov 26 16:47:39 2013
New Revision: 1545721

URL: http://svn.apache.org/r1545721
Log:
[CXF-5420] - Issue with EhCacheTokenStore using default LRU.

Modified:
    
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java

Modified: 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java?rev=1545721&r1=1545720&r2=1545721&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
 (original)
+++ 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
 Tue Nov 26 16:47:39 2013
@@ -145,9 +145,8 @@ public class EHCacheTokenReplayCache imp
                 parsedTTL = 3600;
             }
         }
-        Element element = new Element(id, id);
-        element.setTimeToLive(parsedTTL);
-        element.setTimeToIdle(parsedTTL);
+        Element element = new Element(id, id, parsedTTL, parsedTTL);
+        element.resetAccessStatistics();
         cache.put(element);
     }
     

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java?rev=1545721&r1=1545720&r2=1545721&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
 Tue Nov 26 16:47:39 2013
@@ -95,9 +95,8 @@ public class EHCacheTokenStore implement
         if (token != null && !StringUtils.isEmpty(token.getId())) {
             int parsedTTL = getTTL(token);
             if (parsedTTL > 0) {
-                Element element = new Element(token.getId(), token);
-                element.setTimeToLive(parsedTTL);
-                element.setTimeToIdle(parsedTTL);
+                Element element = new Element(token.getId(), token, parsedTTL, 
parsedTTL);
+                element.resetAccessStatistics();
                 cache.put(element);
             }
         }