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/05/17 16:25:30 UTC
svn commit: r1483824 - in
/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security:
cache/EHCacheReplayCache.java tokenstore/EHCacheTokenStore.java
Author: coheigea
Date: Fri May 17 14:25:30 2013
New Revision: 1483824
URL: http://svn.apache.org/r1483824
Log:
Merged revisions 1483818 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1483818 | coheigea | 2013-05-17 15:17:56 +0100 (Fri, 17 May 2013) | 10 lines
Merged revisions 1483811 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1483811 | coheigea | 2013-05-17 15:06:19 +0100 (Fri, 17 May 2013) | 2 lines
[CXF-5018] - EHCache TimeToLive value overriden in EHCacheReplayCache
........
........
Modified:
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/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=1483824&r1=1483823&r2=1483824&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 Fri May 17 14:25:30 2013
@@ -57,6 +57,9 @@ public class EHCacheReplayCache implemen
Ehcache newCache = new Cache(cc);
cache = cacheManager.addCacheIfAbsent(newCache);
+
+ // Set the TimeToLive value from the CacheConfiguration
+ ttl = cc.getTimeToLiveSeconds();
}
/**
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=1483824&r1=1483823&r2=1483824&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 Fri May 17 14:25:30 2013
@@ -66,6 +66,9 @@ public class EHCacheTokenStore implement
Ehcache newCache = new Cache(cc);
cache = cacheManager.addCacheIfAbsent(newCache);
+
+ // Set the TimeToLive value from the CacheConfiguration
+ ttl = cc.getTimeToLiveSeconds();
}
/**