svn commit: r1545731 - in /cxf/branches/2.7.x-fixes/rt: rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/ ws/security/src/main/java/org/apache/cxf/ws/security/cache/ ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/

[coheigea]

Author: coheigea
Date: Tue Nov 26 17:07:50 2013
New Revision: 1545731

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

Modified:
    
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
    
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java
    
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java

Modified: 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java?rev=1545731&r1=1545730&r2=1545731&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
 Tue Nov 26 17:07:50 2013
@@ -148,6 +148,7 @@ public class EHCacheTokenReplayCache imp
         Element element = new Element(id, id);
         element.setTimeToLive(parsedTTL);
         element.setTimeToIdle(parsedTTL);
+        element.resetAccessStatistics();
         cache.put(element);
     }
     

Modified: 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java?rev=1545731&r1=1545730&r2=1545731&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java
 Tue Nov 26 17:07:50 2013
@@ -106,7 +106,9 @@ public class EHCacheReplayCache implemen
             }
         }
         
-        cache.put(new Element(identifier, identifier, false, parsedTTL, 
parsedTTL));
+        Element element = new Element(identifier, identifier, false, 
parsedTTL, parsedTTL);
+        element.resetAccessStatistics();
+        cache.put(element);
     }
     
     /**

Modified: 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java?rev=1545731&r1=1545730&r2=1545731&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
 Tue Nov 26 17:07:50 2013
@@ -94,6 +94,7 @@ public class EHCacheTokenStore implement
                 Element element = new Element(token.getId(), token);
                 element.setTimeToLive(parsedTTL);
                 element.setTimeToIdle(parsedTTL);
+                element.resetAccessStatistics();
                 cache.put(element);
             }
         }
@@ -106,6 +107,7 @@ public class EHCacheTokenStore implement
                 Element element = new Element(identifier, token);
                 element.setTimeToLive(parsedTTL);
                 element.setTimeToIdle(parsedTTL);
+                element.resetAccessStatistics();
                 cache.put(element);
             }
         }