You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/11/26 18:09:44 UTC
svn commit: r1545733 - in /cxf/branches/2.6.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/
Author: coheigea
Date: Tue Nov 26 17:09:43 2013
New Revision: 1545733
URL: http://svn.apache.org/r1545733
Log:
Merged revisions 1545731 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1545731 | coheigea | 2013-11-26 17:07:50 +0000 (Tue, 26 Nov 2013) | 2 lines
[CXF-5420] - Issue with EhCacheTokenStore using default LRU.
........
Modified:
cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
Modified: cxf/branches/2.6.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.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java?rev=1545733&r1=1545732&r2=1545733&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java (original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java Tue Nov 26 17:09:43 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.6.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.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java?rev=1545733&r1=1545732&r2=1545733&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java Tue Nov 26 17:09:43 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.6.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.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java?rev=1545733&r1=1545732&r2=1545733&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java Tue Nov 26 17:09:43 2013
@@ -95,6 +95,7 @@ public class EHCacheTokenStore implement
Element element = new Element(token.getId(), token);
element.setTimeToLive(parsedTTL);
element.setTimeToIdle(parsedTTL);
+ element.resetAccessStatistics();
cache.put(element);
}
}
@@ -107,6 +108,7 @@ public class EHCacheTokenStore implement
Element element = new Element(identifier, token);
element.setTimeToLive(parsedTTL);
element.setTimeToIdle(parsedTTL);
+ element.resetAccessStatistics();
cache.put(element);
}
}